diff --git a/Backend/Handler/Communication.cs b/Backend/Handler/Communication.cs index a9aebb1..44da74b 100644 --- a/Backend/Handler/Communication.cs +++ b/Backend/Handler/Communication.cs @@ -53,7 +53,7 @@ public class Communication CommunicationObject? communicationObject = JsonSerializer.Deserialize(message); - rep.SendFrame(JsonSerializer.SerializeToUtf8Bytes("Success")); + //rep.SendFrame(JsonSerializer.SerializeToUtf8Bytes("Success")); if (communicationObject is null) { @@ -164,6 +164,8 @@ public class Communication _contentFilter.SetTimeout(value); } + rep.SendFrame(JsonSerializer.SerializeToUtf8Bytes("Success")); + break; } } diff --git a/Backend/Handler/IpScanner.cs b/Backend/Handler/IpScanner.cs index 1614fc5..7838c73 100644 --- a/Backend/Handler/IpScanner.cs +++ b/Backend/Handler/IpScanner.cs @@ -117,7 +117,6 @@ public class IpScanner if (_discardedQueue.Count >= 2000) { - Console.WriteLine("loooooooooooooooooooooooooooool"); Thread.Sleep(500); } @@ -143,9 +142,9 @@ public class IpScanner responseCode = ping.Send(address, _timeout, buf, null).Status; } } - catch (Exception e) + catch { - Console.WriteLine(e); + // } if (responseCode != IPStatus.Success) diff --git a/Backend/Handler/ThreadHandler.cs b/Backend/Handler/ThreadHandler.cs index e4c457a..6fe360a 100644 --- a/Backend/Handler/ThreadHandler.cs +++ b/Backend/Handler/ThreadHandler.cs @@ -51,7 +51,7 @@ public class ThreadHandler { Thread.Sleep(10000); // Let the database handler instantiate and warm up first. - WaitHandle[] wait = _ipScanner.Start(64); + WaitHandle[] wait = _ipScanner.Start(4); WaitHandle.WaitAll(wait); @@ -78,7 +78,7 @@ public class ThreadHandler private void StartDiscardedDbHandler() { - WaitHandle[] wait = _dbHandler.Start(4); + WaitHandle[] wait = _dbHandler.Start(2); WaitHandle.WaitAll(wait); diff --git a/Backend/CountDuplicatedData.sql b/Backend/Sql/CountDuplicatedData.sql similarity index 100% rename from Backend/CountDuplicatedData.sql rename to Backend/Sql/CountDuplicatedData.sql diff --git a/Backend/DropAndCreateDiscarded.sql b/Backend/Sql/DropAndCreateDiscarded.sql similarity index 100% rename from Backend/DropAndCreateDiscarded.sql rename to Backend/Sql/DropAndCreateDiscarded.sql diff --git a/Backend/DropAndCreateFiltered.sql b/Backend/Sql/DropAndCreateFiltered.sql similarity index 100% rename from Backend/DropAndCreateFiltered.sql rename to Backend/Sql/DropAndCreateFiltered.sql diff --git a/Backend/DropAndCreateMyDB.sql b/Backend/Sql/DropAndCreateMyDB.sql similarity index 100% rename from Backend/DropAndCreateMyDB.sql rename to Backend/Sql/DropAndCreateMyDB.sql diff --git a/Backend/UpdateUnfilteredFilteredRow.sql b/Backend/Sql/UpdateUnfilteredFilteredRow.sql similarity index 100% rename from Backend/UpdateUnfilteredFilteredRow.sql rename to Backend/Sql/UpdateUnfilteredFilteredRow.sql diff --git a/Manager/Commands.cs b/Manager/Commands.cs index abccd18..3c77e2e 100644 --- a/Manager/Commands.cs +++ b/Manager/Commands.cs @@ -109,8 +109,6 @@ public static class Commands [RequiresDynamicCode("Calls System.Text.Json.JsonSerializer.SerializeToUtf8Bytes(TValue, JsonSerializerOptions)")] private static ScanningStatus GetProgress(CommunicationObject communicationObject) { - //byte[] bytes = MessagePackSerializer.Serialize(communicationObject, ContractlessStandardResolver.Options); - byte[] lol = JsonSerializer.SerializeToUtf8Bytes(communicationObject); using RequestSocket client = new(); diff --git a/Models/Filtered.db b/Models/Filtered.db new file mode 100644 index 0000000..48380b1 Binary files /dev/null and b/Models/Filtered.db differ diff --git a/Models/ScannerResume.db b/Models/ScannerResume.db new file mode 100644 index 0000000..a44725c Binary files /dev/null and b/Models/ScannerResume.db differ diff --git a/Models/mydb.db b/Models/mydb.db new file mode 100644 index 0000000..8ad61fd Binary files /dev/null and b/Models/mydb.db differ diff --git a/RSE.sln.DotSettings.user b/RSE.sln.DotSettings.user index d2fb5c5..738137f 100644 --- a/RSE.sln.DotSettings.user +++ b/RSE.sln.DotSettings.user @@ -18,6 +18,7 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded