From 69a22fb3ebce94f8c0e01e173ad7c2b0dab856b5 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Thu, 28 Nov 2024 10:26:44 +0100 Subject: [PATCH] Fixed. --- Backend/Handler/Communication.cs | 4 +++- Backend/Handler/IpScanner.cs | 5 ++--- Backend/Handler/ThreadHandler.cs | 4 ++-- Backend/{ => Sql}/CountDuplicatedData.sql | 0 Backend/{ => Sql}/DropAndCreateDiscarded.sql | 0 Backend/{ => Sql}/DropAndCreateFiltered.sql | 0 Backend/{ => Sql}/DropAndCreateMyDB.sql | 0 .../{ => Sql}/UpdateUnfilteredFilteredRow.sql | 0 Manager/Commands.cs | 2 -- Models/Filtered.db | Bin 0 -> 12288 bytes Models/ScannerResume.db | Bin 0 -> 8192 bytes Models/mydb.db | Bin 0 -> 16384 bytes RSE.sln.DotSettings.user | 1 + 13 files changed, 8 insertions(+), 8 deletions(-) rename Backend/{ => Sql}/CountDuplicatedData.sql (100%) rename Backend/{ => Sql}/DropAndCreateDiscarded.sql (100%) rename Backend/{ => Sql}/DropAndCreateFiltered.sql (100%) rename Backend/{ => Sql}/DropAndCreateMyDB.sql (100%) rename Backend/{ => Sql}/UpdateUnfilteredFilteredRow.sql (100%) create mode 100644 Models/Filtered.db create mode 100644 Models/ScannerResume.db create mode 100644 Models/mydb.db 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 0000000000000000000000000000000000000000..48380b104b163fc09888ac27e175777d56742c0a GIT binary patch literal 12288 zcmeH~L2KJE7>4b1ZArJmZiPWXc$b8h!CKgPUZ!=XspBO|X?7`&qb35!c4fIN`vW`f zx9uNI>6$fZzT9>yuRyl^z3(TkJ>!R$~ z#RYMBtRScOpi;Tre3+Y3TncKu zeT<&yF3D7OOKPL8RT3K+lw~D#E3Y!6X9UV6Ye$dcO#O)GSVOya2zO9i zyeGmUE$=5wh%Hr2r0!LA9~0`Cobm6;B+katPsh1dW-=vgQ8i3eV$GWtV#Po)Suvat zL-Ln177S z?~6_l+E4bJhoZUHoS)6@p&tbVKmY_l00ck)1V8`;KmY_l00cnb2@}Bi{|PTHUJV35 Y00ck)1V8`;KmY_l00ck)1nvp^0R_7|w*UYD literal 0 HcmV?d00001 diff --git a/Models/ScannerResume.db b/Models/ScannerResume.db new file mode 100644 index 0000000000000000000000000000000000000000..a44725c94c534967899d2392373bfd3dd9f212b2 GIT binary patch literal 8192 zcmeI1K}#D!6oB8%Mzfp5osBsZ6=cY%g(6D-z$UVa5K@zD&UI~86ETTyHiw=XQlUMz z;1AG?=hkCS=^rR1$KLu2gdpT1(zhEIDl~fY^oE_;+3(G~8NNLYQz;c1zAN|IUeodA zD=>gDFr@^5OROAgRF<$4i$3tp{^?KaUc$upm&Vu#7IPgV&--(AQ>&nmB372 z;XH(D1e1sc@a;b2&_meg3XF}os!i4~p_fN;m6?s^DmX|NzhRNj$3lh;GQ5i)C~%ur eCQQTJK{~90hsls*GE;?7imAAhV25TLZvFzJ^MOqO literal 0 HcmV?d00001 diff --git a/Models/mydb.db b/Models/mydb.db new file mode 100644 index 0000000000000000000000000000000000000000..8ad61fdd412e0581b69fd4f48e17630e8d5f7cba GIT binary patch literal 16384 zcmeI#-A=+V6bJB4Pyz|+l_Vy_(klqWM127#sb*me93_z}GF*uyY```iz>in)QG72u zWMM4e1CW1{rCrb3_58M*(|a~1p&;X#@7f``Q_dAtRqhE<6eTCGti0lOAqUBOH4gmK z=alQ=Wl=tmDSj(wrPCkTp+Nuw5P$##AOHafKmY;|fWSV1k8&ngs#Mgk3D)k2=?4$bQ(XHU!`W``5AZy1eeeoph8y~v5gq$Ps+ z%nL+w=7`o0b&pO;^}0G(=>&_ZtZ0XUSS*G2DpI$ZEvHnl>e;Sn$d$GCv6?HD%j)OV zYENtFg%ei7S|jlbP`q3wrUzMqoRw_3f7dCvYI zfAfXym`isgd`i-1D%7IdTo(Ok5P$##AOHafKmY;|fB*y_009UbumI}+1OB*34FV8= t00bZa0SG_<0uX=z1R$^$K>d$j0Rj+!00bZa0SG_<0uX=z1R!wu0>50^w*CMB literal 0 HcmV?d00001 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