X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=src%2Fhelpers%2FFilterListHelper.h;h=5bd9ad261c146e2e0d01e17a162c33f10f5ebb55;hb=refs%2Fheads%2Fmaster;hp=f8bfdf1cc887810e37a6764c8f2b3b11b6fa2ada;hpb=f8f8d907d0caa128abf73696f812f8e92db812b7;p=PrivacyBrowserPC.git

diff --git a/src/helpers/FilterListHelper.h b/src/helpers/FilterListHelper.h
index f8bfdf1..772d86a 100644
--- a/src/helpers/FilterListHelper.h
+++ b/src/helpers/FilterListHelper.h
@@ -44,6 +44,7 @@ public:
     static const int MAIN_ALLOWLIST = 0;
     static const int MAIN_BLOCKLIST = 1;
     static const int INITIAL_DOMAIN_BLOCKLIST = 2;
+    static const int REGULAR_EXPRESSION_BLOCKLIST = 3;
 
     // The public variables.
     FilterListStruct *easyListStructPointer;
@@ -55,8 +56,8 @@ public:
     // The public functions.
     bool checkFilterLists(QWebEngineUrlRequestInfo &urlRequestInfo, RequestStruct *requestStructPointer) const;
     QString getDispositionString(int dispositionInt) const;
-    QString getFilterOptionDispositionString(const FilterOptionEnum::Disposition filterOptionDisposition) const;
     QString getNavigationTypeString(int navigationTypeInt) const;
+    QString getRequestOptionDispositionString(const FilterOptionEnum::Disposition filterOptionDisposition) const;
     QString getResourceTypeString(int resourceTypeInt) const;
     QString getSublistName(int sublistInt) const;
 
@@ -107,16 +108,23 @@ private:
     QString MAIN_ALLOWLIST_STRING;
     QString MAIN_BLOCKLIST_STRING;
     QString INITIAL_DOMAIN_BLOCKLIST_STRING;
+    QString REGULAR_EXPRESSION_BLOCKLIST_STRING;
 
     // The private functions.
     bool blockRequest(QWebEngineUrlRequestInfo &urlRequestInfo, RequestStruct *requestStructPointer, const QString &filterListTitle, const int sublistInt, EntryStruct *entryStructPointer) const;
+    bool checkAppliedEntry(QWebEngineUrlRequestInfo &urlRequestInfo, UrlStruct &urlStruct, RequestStruct *requestStructPointer, const QString &filterListTitle, const int sublistInt,
+                           EntryStruct *entryStructPointer, QString &urlString, QString &urlStringWithSeparators) const;
+    bool checkDomain(QWebEngineUrlRequestInfo &urlRequestInfo, UrlStruct &urlStruct, RequestStruct *requestStructPointer, const QString &filterListTitle, const int sublistInt,
+                     EntryStruct *entryStructPointer) const;
     bool checkIndividualList(QWebEngineUrlRequestInfo &urlRequestInfo, UrlStruct &urlStruct, RequestStruct *requestStructPointer, FilterListStruct *filterListStructPointer) const;
+    bool checkRegularExpression(QWebEngineUrlRequestInfo &urlRequestInfo, UrlStruct &urlStruct, RequestStruct *requestStructPointer, const QString &filterListTitle, const int sublistInt,
+                                EntryStruct *entryStructPointer) const;
+    bool checkRequestOptions(QWebEngineUrlRequestInfo &urlRequestInfo, RequestStruct *requestStructPointer, const QString &filterListTitle, const int sublistInt,
+                             EntryStruct *entryStructPointer) const;
     bool checkThirdParty(QWebEngineUrlRequestInfo &urlRequestInfo, RequestStruct *requestStructPointer, const bool isThirdPartyRequest, const QString &filterListTitle, const int sublistInt,
                          EntryStruct *entryStructPointer) const;
     FilterListStruct* populateFilterList(const QString &filterListFileName) const;
     void populateRequestStruct(RequestStruct *requestStructPointer, const int disposition, const QString &filterListTitle, const int sublistInt, EntryStruct *entryStructPointer) const;
-    bool processFilterOptions(QWebEngineUrlRequestInfo &urlRequestInfo, RequestStruct *requestStructPointer, const QString &filterListTitle, const int sublistInt,
-                              EntryStruct *entryStructPointer) const;
-    void removeInitialAndTrailingAsterisks(QString &filterListEntry) const;
+    void prepareFilterListString(QString &filterListString, EntryStruct *entryStructPointer) const;
 };
 #endif