Remove 'excluded' legacy parameter for simplification

Softcatala · Aug 10, 2023 · 104bf96 · 104bf96
1 parent 677043d
commit 104bf96
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 47 deletions.
diff --git a/cfg/projects/Calibre.json b/cfg/projects/Calibre.json
@@ -10,8 +10,7 @@
         },
         "calibre-plugins": {
             "url": "https://app.transifex.com/calibre/calibre-plugins/",
-            "type": "transifex",
-            "excluded" : "/en"
+            "type": "transifex"
         }
     }
 }
diff --git a/cfg/projects/CiviCRM.json b/cfg/projects/CiviCRM.json
@@ -6,7 +6,6 @@
         "CiviCRM": {
             "url": "https://app.transifex.com/civicrm/civicrm/",
             "type": "transifex",
-            "excluded": "en_",
             "po_preprocessing" : "remove_untranslated"
         }
     }

diff --git a/cfg/projects/GIMP.json b/cfg/projects/GIMP.json
@@ -7,13 +7,13 @@
         "gimp": {
             "url": "https://l10n.gnome.org/languages/ca/gnome-gimp/ui.tar.gz",
             "type": "compressed",
-            "excluded": "2-10",
+            "pattern": "^(?!.*?2-10).*$",
             "target": "gimp.tar.gz"
         }, 
         "gimp-doc": {
             "url": "https://l10n.gnome.org/languages/ca/gnome-gimp/doc.tar.gz", 
             "type": "compressed",
-            "excluded": "2-10",
+            "pattern": "^(?!.*?2-10).*$",
             "target": "gimp-doc.tar.gz"
         }
     }

diff --git a/cfg/projects/Mailpile.json b/cfg/projects/Mailpile.json
@@ -5,8 +5,7 @@
     "fileset": {
         "Mailpile": {
             "url": "https://app.transifex.com/otf/mailpile",
-            "type": "transifex",
-            "excluded": "en_"
+            "type": "transifex"
         }
     }
 }
diff --git a/cfg/projects/VirtueMart.json b/cfg/projects/VirtueMart.json
@@ -6,7 +6,7 @@
         "VirtueMart": {
             "url": "https://app.transifex.com/virtuemart/virtuemart",
             "type": "transifex",
-            "excluded" : "virtuemart.vm-admin-com_virtuemart"
+            "pattern": "^(?!.*?virtuemart.vm-admin-com_virtuemart).*$"
         }
     }
 }
diff --git a/src/builder/fileset.py b/src/builder/fileset.py
@@ -41,7 +41,6 @@ def __init__(
         self.url = url
         self.filename = filename
         self.add_source = True
-        self.excluded = []
         self.po_catalog = None
         self.words = -1
         self.duplicates = ""
@@ -85,10 +84,6 @@ def set_pattern(self, pattern):
     def set_tm_file(self, tm_file):
         self.tm_file = tm_file
 
-    def add_excluded(self, filename):
-        if len(filename) > 0:
-            self.excluded.append(filename)
-
     def set_po_preprocessing(self, po_preprocessing):
         self.po_preprocessing = po_preprocessing
 
@@ -124,17 +119,6 @@ def _po_preprocessing(self):
             pofile = POFile(filename)
             pofile.po_preprocessing(self.po_preprocessing)
 
-    def _should_exclude_file(self, filename):
-        exclude = False
-        for exfilename in self.excluded:
-            if filename.find(exfilename) != -1:
-                exclude = True
-
-        if exclude:
-            logging.info("Excluding file: {0}".format(filename))
-
-        return exclude
-
     def clean_up_after_convert(self):
         self._remove_non_translation_files()
 
@@ -144,10 +128,6 @@ def _delete_tm_fileset(self, fileset_tm):
 
     def _build_tm_for_fileset(self, fileset_tm, files):
         for filename in files:
-            if self._should_exclude_file(filename):
-                os.remove(filename)
-                continue
-
             pofile = POFile(filename)
             if self.duplicates == "msgctxt":
                 pofile.add_msgctxt_to_duplicates()

diff --git a/src/builder/jsonbackend.py b/src/builder/jsonbackend.py
@@ -62,7 +62,6 @@ def __init__(self):
         self.name = ""
         self.url = ""
         self.type = ""
-        self.excluded = ""
         self.target = ""
         self.pattern = ""
         self.duplicates = ""
@@ -72,15 +71,14 @@ def __init__(self):
 
     def __str__(self):
         text = (
-            "FileSetDTO. Name: {0}, url: {1}, type: {2}, excluded: {3}, "
-            "target: {4}, pattern: {5}, duplicates: {6}, po_preprocessing {7}, "
-            "retrieval_pattern {8}"
+            "FileSetDTO. Name: {0}, url: {1}, type: {2}, target: {3},"
+            "pattern: {4}, duplicates: {5}, po_preprocessing {6}, "
+            "retrieval_pattern {7}"
         )
         return text.format(
             self.name,
             self.url,
             self.type,
-            self.excluded,
             self.target,
             self.pattern,
             self.duplicates,
@@ -137,8 +135,6 @@ def _process_file_set_attributes(self, fileset, fileset_value):
                 fileset.type = fileset_properties_value
             elif fileset_properties_attr == "target":
                 fileset.target = fileset_properties_value
-            elif fileset_properties_attr == "excluded":
-                fileset.excluded = fileset_properties_value
             elif fileset_properties_attr == "pattern":
                 fileset.pattern = fileset_properties_value
             elif fileset_properties_attr == "duplicates":

diff --git a/src/builder/project.py b/src/builder/project.py
@@ -219,7 +219,6 @@ def add_filesets(self, project_dto):
                 raise Exception(msg)
 
             fs.set_pattern(fileset.pattern)
-            fs.add_excluded(fileset.excluded)
             fs.set_duplicates(fileset.duplicates)
             fs.set_conversor_setup(fileset.conversor_setup)
             fs.set_po_preprocessing(fileset.po_preprocessing)

diff --git a/src/tests/builder-tests/data/projects/testjsonbackend-mozilla.json b/src/tests/builder-tests/data/projects/testjsonbackend-mozilla.json
@@ -9,7 +9,6 @@
 			"url" : "http://pootle.softcatala.org/ca/mozilla/export/zip",
 			"type": "compressed",
 			"target": "mozilla.zip",
-			"excluded" : "region.properties.po",
             "pattern" : "ca.po",
             "duplicates" : "msgctxt",
             "retrieval_pattern": "https://.*?/ca/.*?",

diff --git a/src/tests/builder-tests/testfileset.py b/src/tests/builder-tests/testfileset.py
@@ -33,14 +33,6 @@ def _get_fileset(self):
             "none.po",
         )
 
-    def test_has_filename_filename(self):
-        fileset = self._get_fileset()
-        fileset.add_excluded("excluded.po")
-
-        self.assertTrue(fileset._should_exclude_file("excluded.po"))
-        self.assertTrue(fileset._should_exclude_file("Includesexcluded.po"))
-        self.assertFalse(fileset._should_exclude_file("eXcluded.po"))
-
     def test_has_filename_filename_project(self):
         fileset_parent = self._get_fileset()
         fileset_parent.po_preprocessing = "po_processing"

diff --git a/src/tests/builder-tests/testjsonbackend.py b/src/tests/builder-tests/testjsonbackend.py
@@ -27,8 +27,6 @@ def _validate_mozilla_project_mozilla_fileset(self, fileset):
         self.assertEquals(fileset.name, "mozilla")
         self.assertEquals(fileset.url, url)
         self.assertEquals(fileset.type, "compressed")
-        self.assertEquals(fileset.excluded, "region.properties.po")
-        self.assertEquals(fileset.excluded, "region.properties.po")
         self.assertEquals(fileset.pattern, "ca.po")
         self.assertEquals(fileset.retrieval_pattern, "https://.*?/ca/.*?")
         self.assertEquals(fileset.duplicates, "msgctxt")