Stone_Red/HyperbolicDownloader
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/HyperbolicDownloader.git synced 2026-09-08 23:41:05 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Fix important bug

Browse Source 
- Fixed a bug that caused the content of the file to be sent as the filename
This commit is contained in:
Stone_Red
2022-02-28 20:28:05 +01:00
parent 9675361695
commit a90af811c1
2 changed files with 85 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HyperbolicDownloaderApi/Commands/DownloadCommands.cs
+6 -7
View File
@@ -114,7 +114,7 @@ public class DownloadCommands
int bytesRead; int bytesRead;
try try
{ {
bytesRead = nwStream.Read(buffer, 0, tcpClient.ReceiveBufferSize); bytesRead = nwStream.Read(buffer, 0, 1000);
} }
catch (IOException) catch (IOException)
{ {
@@ -127,8 +127,12 @@ public class DownloadCommands
string[] parts = dataReceived.Split('/'); string[] parts = dataReceived.Split('/');
if (parts.Length == 2) //If received data does not contain 2 parts -> error if (parts.Length != 2) //If received data does not contain 2 parts -> error
{ {
ApiManager.SendMessageNewLine(dataReceived, NotificationMessageType.Error);
continue;
}
bool validFileSize = int.TryParse(parts[0], out int fileSize); bool validFileSize = int.TryParse(parts[0], out int fileSize);
if (!validFileSize || fileSize <= 0) if (!validFileSize || fileSize <= 0)
@@ -224,11 +228,6 @@ public class DownloadCommands
hostsManager.SaveHosts(); hostsManager.SaveHosts();
return; return;
} }
else
{
ApiManager.SendMessageNewLine(dataReceived, NotificationMessageType.Error);
}
}
ApiManager.SendMessageNewLine("None of the available hosts have the requested file!", NotificationMessageType.Error); ApiManager.SendMessageNewLine("None of the available hosts have the requested file!", NotificationMessageType.Error);
hostsManager.SaveHosts(); hostsManager.SaveHosts();
} }
HyperbolicDownloaderApi/Networking/NetworkClient.cs
+7 -1
View File
@@ -167,6 +167,9 @@ namespace HyperbolicDownloaderApi.Networking
FileInfo fileInfo = new FileInfo(hyperFileInfo.FilePath); FileInfo fileInfo = new FileInfo(hyperFileInfo.FilePath);
bytesToSend = Encoding.ASCII.GetBytes($"{fileInfo.Length}/{Path.GetFileName(hyperFileInfo.FilePath)}"); bytesToSend = Encoding.ASCII.GetBytes($"{fileInfo.Length}/{Path.GetFileName(hyperFileInfo.FilePath)}");
Array.Resize(ref bytesToSend, 1000);
await nwStream.WriteAsync(bytesToSend); await nwStream.WriteAsync(bytesToSend);
foreach (byte[]? chunk in FileCompressor.ReadChunks(hyperFileInfo.FilePath, 64000)) foreach (byte[]? chunk in FileCompressor.ReadChunks(hyperFileInfo.FilePath, 64000))
@@ -182,12 +185,15 @@ namespace HyperbolicDownloaderApi.Networking
bytesToSend = Encoding.ASCII.GetBytes("File not found!"); bytesToSend = Encoding.ASCII.GetBytes("File not found!");
await nwStream.WriteAsync(bytesToSend); await nwStream.WriteAsync(bytesToSend);
} }
client.Close();
} }
catch (Exception ex) catch (Exception ex)
{ {
Debug.WriteLine(ex); Debug.WriteLine(ex);
} }
finally
{
client.Close();
}
} }
public void StopListening() public void StopListening()