python3-cyberfusion-queue-support 1.6__tar.gz → 1.7.0__tar.gz

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 1.6
+Version: 1.7.0
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-1.7.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-queue-support"
-version = "1.6"
+version = "1.7.0"
 description = "Library to queue actions."
 readme = "README.md"
 authors = [

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-1.7.0}/src/cyberfusion/QueueSupport/items/copy.py

@@ -36,22 +36,29 @@ class CopyItem(_Item):
         if os.path.islink(self.destination):
             raise PathIsSymlinkError(self.destination)
 
-    def _get_changed_lines(self) -> List[str]:
+    def _get_changed_lines(self) -> Optional[List[str]]:
         """Get differences with destination file.
 
-        No differences are returned when contents is not string.
+        Returns None if the changed_lines could not be determined, for example
+        if the destination file is encrypted.
         """
         changed_lines = []
 
-        contents = []
+        destination_contents = []
 
-        if os.path.isfile(self.destination):
-            contents = open(self.destination).readlines()
+        try:
+            source_contents = open(self.source).readlines()
+        except UnicodeDecodeError:
+            return None
 
-        source_contents = open(self.source).readlines()
+        if os.path.isfile(self.destination):
+            try:
+                destination_contents = open(self.destination).readlines()
+            except UnicodeDecodeError:
+                return None
 
         for line in difflib.unified_diff(
-            contents,
+            destination_contents,
             source_contents,
             fromfile=self.source,
             tofile=self.destination,
@@ -69,7 +76,14 @@ class CopyItem(_Item):
 
         changed_lines = self._get_changed_lines()
 
-        if not os.path.exists(self.destination) or changed_lines:
+        if not os.path.exists(self.destination):
+            copy = True
+        elif changed_lines is None:
+            copy = True
+        else:
+            copy = bool(changed_lines)
+
+        if copy:
             outcomes.append(
                 CopyItemCopyOutcome(
                     source=self.source,

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-1.7.0}/src/cyberfusion/QueueSupport/outcomes.py

@@ -10,7 +10,7 @@ class CopyItemCopyOutcome(OutcomeInterface):
     """Represents outcome."""
 
     def __init__(
-        self, *, source: str, destination: str, changed_lines: list[str]
+        self, *, source: str, destination: str, changed_lines: Optional[list[str]] = None
     ) -> None:
         """Set attributes."""
         self.source = source
@@ -19,10 +19,13 @@ class CopyItemCopyOutcome(OutcomeInterface):
 
     def __str__(self) -> str:
         """Get human-readable string."""
-        changed_lines = "\n".join(self.changed_lines)
+        if self.changed_lines:
+            changed_lines = "\nChanged lines:\n" + "\n".join(self.changed_lines)
+        else:
+            changed_lines = ""
 
         return (
-            f"Copy {self.source} to {self.destination}.\nChanged_lines:\n{changed_lines}"
+            f"Copy {self.source} to {self.destination}.{changed_lines}"
         )
 
     def __eq__(self, other: object) -> bool:

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-1.7.0}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 1.6
+Version: 1.7.0
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support