Timerix/DTLib
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

SimpleConverter and cs9somefix were merged to FrameworkFix

Browse Source
This commit is contained in:
Timerix
2021-10-12 19:15:00 +03:00
parent 350ad15c40
commit 398866cb7b
6 changed files with 42 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Network/FSP.cs
View File

@@ -67,11 +67,11 @@ namespace DTLib.Network
Mutex.Execute(() =>
{
BytesDownloaded=0;
Filesize=SimpleConverter.ToString(MainSocket.GetPackage()).ToUInt();
Filesize=FrameworkFix.ToString(MainSocket.GetPackage()).ToUInt();
MainSocket.SendPackage("ready".ToBytes());
int packagesCount = 0;
byte[] buffer = new byte[5120];
int fullPackagesCount = SimpleConverter.Truncate(Filesize/buffer.Length);
int fullPackagesCount = FrameworkFix.Truncate(Filesize/buffer.Length);
// получение полных пакетов файла
for(byte n = 0; packagesCount<fullPackagesCount; packagesCount++)
{
@@ -115,7 +115,7 @@ namespace DTLib.Network
MainSocket.GetAnswer("ready");
byte[] buffer = new byte[5120];
int packagesCount = 0;
int fullPackagesCount = SimpleConverter.Truncate(Filesize/buffer.Length);
int fullPackagesCount = FrameworkFix.Truncate(Filesize/buffer.Length);
// отправка полных пакетов файла
for(; packagesCount<fullPackagesCount; packagesCount++)
{
@@ -144,7 +144,7 @@ namespace DTLib.Network
if(!dirOnServer.EndsWith("\\"))
dirOnServer+="\\";
Debug("b", "downloading manifest <", "c", dirOnServer+"manifest.dtsod", "b", ">\n");
var manifest = new Dtsod.DtsodV22(SimpleConverter.ToString(DownloadFileToMemory(dirOnServer+"manifest.dtsod")));
var manifest = new Dtsod.DtsodV22(FrameworkFix.ToString(DownloadFileToMemory(dirOnServer+"manifest.dtsod")));
Debug("g", $"found {manifest.Values.Count} files in manifest\n");
var hasher = new Hasher();
foreach(string fileOnServer in manifest.Keys)

2
Network/Package.cs
View File

@@ -55,7 +55,7 @@ namespace DTLib.Network
// получает пакет и выбрасывает исключение, если пакет не соответствует образцу
public static void GetAnswer(this Socket socket, string answer)
{
string rec = SimpleConverter.ToString(socket.GetPackage());
string rec = FrameworkFix.ToString(socket.GetPackage());
if(rec!=answer)
throw new Exception($"GetAnswer() error: invalid answer: <{rec}>");
}