sem/Proftaak-RH-B4
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Develop #10

Merged
SemvdH merged 229 commits from develop into master 2020-10-29 22:50:49 +00:00
Conversation 0 Commits 229 Files Changed 107 +13 -22
1 changed files with 13 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit dffdae2cb4 - Show all commits

35
Server/Client.cs
View File

@@ -197,42 +197,33 @@ namespace Server
{ {
DirectoryInfo dirInf = new DirectoryInfo(Directory.GetCurrentDirectory() + "/" + username + "/"); DirectoryInfo dirInf = new DirectoryInfo(Directory.GetCurrentDirectory() + "/" + username + "/");
DirectoryInfo[] directoryInfos = dirInf.GetDirectories(); DirectoryInfo[] directoryInfos = dirInf.GetDirectories();
for (int i = 0; i < directoryInfos.Length; i++) for (int i = directoryInfos.Length-1; i >= 0; i--)
{ {
DirectoryInfo info = directoryInfos[i]; DirectoryInfo info = directoryInfos[i];
string newPath = path + info.Name + "/rawBike.bin"; string newPath = path + info.Name + "/rawBike.bin";
Debug.WriteLine("[SERVER CLIENT] checking for " + newPath); Debug.WriteLine("[SERVER CLIENT] checking for " + newPath);
sb.Append(getRawBikeDataFromFile(newPath));
if (i != directoryInfos.Length - 1) sb.Append("\n");
FileInfo fi = new FileInfo(newPath); FileInfo fi = new FileInfo(newPath);
length += (int)fi.Length; length += (int)fi.Length;
if (length >= 1024) break;
string append = Encoding.ASCII.GetString(File.ReadAllBytes(newPath));
Debug.WriteLine("[SERVER CLIENT] appending " + append);
sb.Append(append);
if (i != 0) sb.Append("\n");
} }
Debug.WriteLine("[SERVER CLIENT] made path to " + path);
} }
catch catch (Exception e)
{ {
Debug.WriteLine("Folder for user " + username + " does not exist"); Debug.WriteLine("[SERVER CLIENT] excetion while trying to get raw bike data: " + e.Message);
}
if (length > 10240)
{
Debug.WriteLine("[SERVER CLIENT] packet was too big!");
return;
} }
Debug.WriteLine("[SERVER CLIENT] about to send " +sb.ToString());
communication.Doctor.sendMessage(DataParser.GetFileMessage(Encoding.ASCII.GetBytes(sb.ToString()))); communication.Doctor.sendMessage(DataParser.GetFileMessage(Encoding.ASCII.GetBytes(sb.ToString())));
} }
public byte[] getRawBikeDataFromFile(string path)
{
return File.ReadAllBytes(path);
}
private bool handleLogin(byte[] payloadbytes) private bool handleLogin(byte[] payloadbytes)
{ {
string username; string username;