python3-cyberfusion-file-support 1.5__tar.gz → 1.6.0__tar.gz

{python3_cyberfusion_file_support-1.5 → python3_cyberfusion_file_support-1.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-file-support
-Version: 1.5
+Version: 1.6.0
 Summary: Library for idempotent writing to files.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-file-support

{python3_cyberfusion_file_support-1.5 → python3_cyberfusion_file_support-1.6.0}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-file-support"
-version = "1.5"
+version = "1.6.0"
 description = "Library for idempotent writing to files."
 readme = "README.md"
 authors = [

{python3_cyberfusion_file_support-1.5 → python3_cyberfusion_file_support-1.6.0}/src/cyberfusion/FileSupport/__init__.py

@@ -123,18 +123,35 @@ class DestinationFileReplacement:
         with open(path, open_mode) as f:
             f.write(contents)
 
+    @property
+    def _copy_item(self) -> CopyItem:
+        """Get copy item."""
+        return CopyItem(
+            source=self.tmp_path,
+            destination=self.destination_file.path,
+            reference=self.reference,
+        )
+
+    @property
+    def changed(self) -> bool:
+        """Check if the destination file content has changed."""
+        if self.encryption_properties:
+            decrypted_contents = self.destination_file.decrypt()
+
+            return decrypted_contents != self.contents
+
+        return bool(self._copy_item.outcomes)
+
     def add_to_queue(self) -> None:
         """Add items for replacement to queue."""
         add_copy_item = True
 
-        decrypted_contents = self.destination_file.decrypt()
-
         # If encrypted, only add CopyItem when unencrypted contents changed.
         # CopyItem does not account for encryption, so without this check the
         # file would always be copied.
 
-        if decrypted_contents:
-            add_copy_item = decrypted_contents != self.contents
+        if self.encryption_properties:
+            add_copy_item = self.changed
 
         # Copy and unlink instead of move. MoveItem copies metadata (which
         # means mode etc. of destination file is incorrect, as set to the tmp
@@ -143,11 +160,7 @@ class DestinationFileReplacement:
         # is unchanged.
 
         if add_copy_item:
-            copy_item = CopyItem(
-                source=self.tmp_path,
-                destination=self.destination_file.path,
-                reference=self.reference,
-            )
+            copy_item = self._copy_item
 
             self.queue.add(copy_item)
 

{python3_cyberfusion_file_support-1.5 → python3_cyberfusion_file_support-1.6.0}/src/python3_cyberfusion_file_support.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-file-support
-Version: 1.5
+Version: 1.6.0
 Summary: Library for idempotent writing to files.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-file-support