Fix another issue related to modify a list when looping

Author: Iago Veloso

README.md

@@ -49,14 +49,14 @@ The easier way to run this project is using docker:
 
 Run example; notice `source` and `my_catalogue` need to be replace with your destinations:
 
-    docker run --rm -v $(pwd)/source:/input:ro -v $(pwd)/my_catalogue:/output iago1460/catalogue:1.2.4 --src /input --dst /output --operation copy
+    docker run --rm -v $(pwd)/source:/input:ro -v $(pwd)/my_catalogue:/output iago1460/catalogue:1.2.5 --src /input --dst /output --operation copy
 
 
 ### In a virtual environment
 
     virtualenv venv
     source venv/bin/activate
-    pip3 install https://github.com/iago1460/photo-cataloguer/archive/1.2.4.zip
+    pip3 install https://github.com/iago1460/photo-cataloguer/archive/1.2.5.zip
     catalogue --help
 
 

catalogue/main.py

@@ -147,9 +147,10 @@ def main():
             chain(*[files[1:] for files in duplicated_list_of_files_to_import])
         )
 
+    files = src_catalogue.files
     if not dst_catalogue:
-        logging.info(f"Detected {len(src_catalogue.files)} files:")
-        for file in src_catalogue.files:
+        logging.info(f"Detected {len(files)} files:")
+        for file in files:
             created = file.get_creation_date()
             if not file.is_media_type():
                 logging.debug(f"Ignoring {file.get_media_type()} file {file.path} ")
@@ -160,8 +161,7 @@ def main():
 
     imported_files = []
     if dst_catalogue:
-        logging.info(f"Processing {len(src_catalogue.files)} files:")
-        files = src_catalogue.files
+        logging.info(f"Processing {len(files)} files:")
         for file in progressbar.progressbar(files, redirect_stdout=True):
             media_type = file.get_media_type()
             if not file.is_media_type():

catalogue/model.py

@@ -139,15 +139,19 @@ def asdict(self):
 class Catalogue:
     root_path = None
     last_update = None
-    files = None
+    _files = None
     _files_by_path = None
     _files_by_size = None
     _files_by_short_hash = None
     _files_by_hash = None
 
+    @property
+    def files(self):
+        return tuple(self._files.copy())
+
     def __init__(self, root_path: Path, files=None, last_update=None):
         self.root_path = root_path
-        self.files = []
+        self._files = []
         self.last_update = last_update
         self._files_by_path = {}
         self._files_by_size = {}
@@ -216,7 +220,7 @@ def notify(self, file, field, new_value):
             if not new_value.is_relative_to(self.root_path):
                 file.unsubscribe(self)
                 with suppress(ValueError):
-                    self.files.remove(file)
+                    self._files.remove(file)
                 with suppress(ValueError):
                     self._files_by_size.setdefault(file.size, []).remove(file)
                 with suppress(ValueError):
@@ -232,7 +236,7 @@ def notify(self, file, field, new_value):
 
     def add_file(self, file):
         file.subscribe(self)
-        self.files.append(file)
+        self._files.append(file)
         self._files_by_path[file.path] = file
         self._files_by_size.setdefault(file.size, []).append(file)
         if file._short_hash:
@@ -295,7 +299,7 @@ def file_asdict(file):
         return {
             "version": __version__,
             "last_update": self.last_update.isoformat(),
-            "files": [file_asdict(file) for file in self.files],
+            "files": [file_asdict(file) for file in self._files],
         }
 
     def save_db(self):