diff --git a/Backend/Handler/ContentFilter.cs b/Backend/Handler/ContentFilter.cs index 0476fdd..706202c 100644 --- a/Backend/Handler/ContentFilter.cs +++ b/Backend/Handler/ContentFilter.cs @@ -23,7 +23,7 @@ public class ContentFilter _dbHandler = dbHandler; _basePath = basePath; _unfilteredQueue = unfilteredQueue; - + _getDomainPort80 = $"{basePath}/Backend/Scripts/GetDomainNamePort80.sh"; _getDomainPort443 = $"{basePath}/Backend/Scripts/GetDomainNamePort443.sh"; @@ -51,13 +51,13 @@ public class ContentFilter { while (!_stop) { - long indexes = _dbHandler.GetUnfilteredIndexes(); + List indexes = _dbHandler.GetUnfilteredIndexes(); - for (long i = 0; i < indexes; i++) + for (int i = 0; i < indexes.Count; i++) { if (_stop) break; - Unfiltered unfiltered = _dbHandler.ReadUnfilteredWithId(i); + Unfiltered unfiltered = _dbHandler.ReadUnfilteredWithId(indexes[i]); if (unfiltered.Filtered) continue; diff --git a/Backend/Handler/IpScanner.cs b/Backend/Handler/IpScanner.cs index fc69a71..c4b5e51 100644 --- a/Backend/Handler/IpScanner.cs +++ b/Backend/Handler/IpScanner.cs @@ -33,7 +33,7 @@ public class IpScanner _unfilteredQueue = unfilteredQueue; _resumeQueue = resumeQueue; - SetTimeout(128); + SetTimeout(64); } public void SetTimeout(int milliseconds) diff --git a/Models/Handler/DbHandler.cs b/Models/Handler/DbHandler.cs index 87e94b5..dbae440 100644 --- a/Models/Handler/DbHandler.cs +++ b/Models/Handler/DbHandler.cs @@ -48,7 +48,7 @@ public class DbHandler " VALUES (@threadNumber, @startRange, @endRange, @firstByte, @secondByte, @thirdByte, @fourthByte);"; private const string ReadUnfilteredStatement = "SELECT * FROM Unfiltered WHERE Id = @id;"; - private const string ReadUnfilteredIdsStatement = "SELECT Id FROM Unfiltered WHERE Id != 0 ORDER BY Id DESC LIMIT 1;"; + private const string ReadUnfilteredIdsStatement = "SELECT Id FROM Unfiltered WHERE Filtered == 0;"; private const string ReadFilteredStatement = "SELECT Title2, Url2 FROM Filtered WHERE (Url2 NOT NULL AND Url2 != '') AND (Title2 NOT NULL AND Title2 != '') ORDER BY Url2 DESC;"; private const string ReadFilteredIdsStatement = "SELECT Id FROM Filtered WHERE Id != 0 ORDER BY Id DESC LIMIT 1;"; private const string ReadFilteredIpStatement = "SELECT Ip1, Ip2, Ip3, Ip4 FROM Filtered WHERE Ip1 == @ip1 AND Ip2 == @ip1 AND Ip3 == @ip1 AND Ip4 == @ip1 ORDER BY Ip1 DESC LIMIT 1;"; @@ -372,10 +372,8 @@ public class DbHandler return unfiltered; } - public long GetUnfilteredIndexes() + public List GetUnfilteredIndexes() { - long rowId = 0; - using SqliteConnection connection = new(_unfilteredConnectionString); connection.Open(); @@ -384,15 +382,17 @@ public class DbHandler if (!reader.HasRows) { - return 0; + return []; } + + List ids = []; while (reader.Read()) { - rowId = reader.GetInt64(0); + ids.Add(reader.GetInt64(0)); } - return rowId; + return ids; } public long GetFilteredIndexes() diff --git a/Models/Models.csproj.DotSettings b/Models/Models.csproj.DotSettings deleted file mode 100644 index 2bba1c5..0000000 --- a/Models/Models.csproj.DotSettings +++ /dev/null @@ -1,3 +0,0 @@ - - False - True \ No newline at end of file diff --git a/RSE.sln.DotSettings.user b/RSE.sln.DotSettings.user index 8d56886..d78a6a8 100644 --- a/RSE.sln.DotSettings.user +++ b/RSE.sln.DotSettings.user @@ -1,32 +1,5 @@  - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded - ForceIncluded \ No newline at end of file + ForceIncluded + ForceIncluded + ForceIncluded + ForceIncluded \ No newline at end of file