changed the finding attribute value

Author: jellizaveta

src/main/builder.js

@@ -255,6 +255,14 @@ module.exports = (function () {
         return s;
     };
 
+    /**
+     * Extracting the value of an attribute.
+     *
+     * @param {string} attribute - The input attribute string.
+     * @returns {string} The extracted attribute value.
+     */
+    const getOptionValue = (attribute) => attribute.slice(attribute.indexOf('="') + 2, -1);
+
     /**
      * Parses include line
      *
@@ -283,17 +291,8 @@ module.exports = (function () {
                 exclude = attribute.substring(attribute.indexOf('=') + 1);
                 exclude = stripEndQuotes(exclude);
             } else if (attribute.startsWith(INCLUDE_OPTION_MODIFIERS)) {
-                // Find the index of the first occurrence of '="' and add 2 to get the start index of the value.
-                const startIndex = attribute.indexOf('="') + 2;
-                // Find the index of the last occurrence of '"' to get the end index of the value.
-                const endIndex = attribute.lastIndexOf('"');
-                if (startIndex !== -1 && endIndex !== -1) {
-                    // If both start and end indexes are found, extract the value between the quotes.
-                    addModifiers = attribute.slice(startIndex, endIndex);
-                } else {
-                    // If the quotes are not found, set 'addModifiers' to null.
-                    addModifiers = null;
-                }
+                // If value of the option is not specified, then it will be set to null.
+                addModifiers = getOptionValue(attribute) || null;
             }
         }
 

src/main/platforms/generator.js

@@ -505,7 +505,7 @@ module.exports = (() => {
             } else {
                 metadata = removeObsoleteFilters(metadata);
             }
-
+            // #TODO: https://github.com/AdguardTeam/FiltersCompiler/issues/195
             const filtersContent = JSON.stringify(metadata, null, '\t');
 
             fs.writeFileSync(filtersFileJson, filtersContent, 'utf8');

src/test/builder.test.js

@@ -81,8 +81,10 @@ describe('Test builder', () => {
                         expect(line.trim().endsWith('$image,script')).toBeTruthy();
                     });
             });
-
-            it('filter 8 test', async () => {
+            // Temporarily left at number eight, because under the number of its id (10) in filters.json
+            // stands above the Base filter and tests for the Base filter, checking the sequence - crashes
+            // #TODO: fix this
+            it('filter 10 test', async () => {
                 // Read the content of the file and split it into lines
                 const filterContent = await readFile(path.join(filtersDir, 'filter_8_Modifiers', 'filter.txt'));
                 const filterLines = filterContent.split(/\r?\n/);
@@ -91,7 +93,7 @@ describe('Test builder', () => {
                 // Get only rule lines without empty lines or comments
                 const ruleLines = filterLines.filter((line) => !line.startsWith('!') && line.length > 0);
                 // Check that the number of lines in the file is equal to 10 (excluding comments)
-                expect(ruleLines.length).toEqual(10);
+                expect(ruleLines.length).toEqual(15);
                 // Check that each line (excluding comments) contains '$'
                 ruleLines
                     .forEach((line) => {

src/test/resources/filters/cname_trackers.txt

@@ -6,5 +6,6 @@
 a155e09a56.reuters.tv
 albany.townsquarenewsletters.com
 alerts.dmgt.com
+! comment
 aremedia.e.aremedia.com.au
 auto.scissorsscotch.com

src/test/resources/filters/filter_8_Modifiers/template.txt

@@ -1,6 +1,9 @@
 ! Homepage: http://adguard.com/filters.html#english
 ! License: http://creativecommons.org/licenses/by-sa/3.0/
 !
+!#if (adguard_app_mac)
+@include ../cname_trackers.txt /stripComments /addModifiers="image"
+!#endif
 !#if (adguard_app_ios)
 @include ../cname_trackers.txt /addModifiers="image,script"
 !#endif