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

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

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python3-cyberfusion-file-support
-Version: 1.3
+Version: 1.5
 Summary: Library for idempotent writing to files.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-file-support
 Description-Content-Type: text/markdown
 Requires-Dist: python3-cyberfusion-common~=2.0
-Requires-Dist: python3-cyberfusion-queue-support~=1.3
+Requires-Dist: python3-cyberfusion-queue-support~=1.7.0
 
 # python3-cyberfusion-file-support
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-file-support"
-version = "1.3"
+version = "1.5"
 description = "Library for idempotent writing to files."
 readme = "README.md"
 authors = [
@@ -12,7 +12,7 @@ authors = [
 ]
 dependencies = [
     "python3-cyberfusion-common~=2.0",
-    "python3-cyberfusion-queue-support~=1.3",
+    "python3-cyberfusion-queue-support~=1.7.0",
 ]
 
 [project.urls]

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

@@ -1,7 +1,5 @@
 """Classes for files."""
 
-import difflib
-
 import os
 
 from typing import List, Optional, Union
@@ -35,20 +33,15 @@ class _DestinationFile:
         self.encryption_properties = encryption_properties
 
     @property
-    def exists(self) -> bool:
+    def _exists(self) -> bool:
         """Get if exists."""
         return os.path.exists(self.path)
 
-    @property
-    def contents(self) -> Optional[str]:
-        """Get contents."""
-        if not self.exists:
+    def decrypt(self) -> Optional[str]:
+        """Decrypt file."""
+        if not self._exists or not self.encryption_properties:
             return None
 
-        if not self.encryption_properties:
-            with open(self.path, "r") as f:
-                return f.read()
-
         try:
             return decrypt_file(self.encryption_properties, self.path)
         except DecryptionError as e:
@@ -97,8 +90,8 @@ class DestinationFileReplacement:
         """Get contents."""
         if self._contents != "" and not self._contents.endswith(
             "\n"
-        ):  # Some programs require newline to consider last line completed
-            raise ValueError
+        ):  # Some programs require EOL
+            self._contents += "\n"
 
         if not self.default_comment_character:
             return self._contents
@@ -130,57 +123,35 @@ class DestinationFileReplacement:
         with open(path, open_mode) as f:
             f.write(contents)
 
-    @property
-    def changed(self) -> bool:
-        """Get if destination file will change."""
-        if not self.destination_file.exists:
-            return True
+    def add_to_queue(self) -> None:
+        """Add items for replacement to queue."""
+        add_copy_item = True
 
-        return self.destination_file.contents != self.contents
+        decrypted_contents = self.destination_file.decrypt()
 
-    @property
-    def differences(self) -> List[str]:
-        """Get differences with destination file.
+        # 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.
 
-        No differences are returned when contents is not string.
-        """
-        results = []
-
-        for line in difflib.unified_diff(
-            (
-                self.destination_file.contents.splitlines()
-                if self.destination_file.contents
-                else []
-            ),
-            self.contents.splitlines(),
-            fromfile=self.tmp_path,
-            tofile=self.destination_file.path,
-            lineterm="",
-            n=0,
-        ):
-            results.append(line)
+        if decrypted_contents:
+            add_copy_item = decrypted_contents != self.contents
 
-        return results
+        # Copy and unlink instead of move. MoveItem copies metadata (which
+        # means mode etc. of destination file is incorrect, as set to the tmp
+        # file until corrected by later queue items). CopyItem does not copy
+        # metadata, so if the destination file already exists, its mode etc.
+        # is unchanged.
 
-    def add_to_queue(self) -> None:
-        """Add items for replacement to queue."""
-        if self.changed:
-            # Copy when changed and always unlink, instead of move when changed
-            # and unlink when changed. MoveItem copies metadata (which means
-            # mode etc. of destination file is incorrect, as set to the tmp file
-            # until corrected by later queue items). CopyItem does not copy
-            # metadata, so if the destination file already exists, its mode
-            # etc. is unchanged.
-
-            self.queue.add(
-                CopyItem(
-                    source=self.tmp_path,
-                    destination=self.destination_file.path,
-                    reference=self.reference,
-                ),
+        if add_copy_item:
+            copy_item = CopyItem(
+                source=self.tmp_path,
+                destination=self.destination_file.path,
+                reference=self.reference,
             )
 
-            if self.command:
+            self.queue.add(copy_item)
+
+            if self.command and copy_item.outcomes:
                 self.queue.add(
                     CommandItem(command=self.command, reference=self.reference),
                 )

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

@@ -1,12 +1,12 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: python3-cyberfusion-file-support
-Version: 1.3
+Version: 1.5
 Summary: Library for idempotent writing to files.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-file-support
 Description-Content-Type: text/markdown
 Requires-Dist: python3-cyberfusion-common~=2.0
-Requires-Dist: python3-cyberfusion-queue-support~=1.3
+Requires-Dist: python3-cyberfusion-queue-support~=1.7.0
 
 # python3-cyberfusion-file-support
 

python3_cyberfusion_file_support-1.5/src/python3_cyberfusion_file_support.egg-info/requires.txt

@@ -0,0 +1,2 @@
+python3-cyberfusion-common~=2.0
+python3-cyberfusion-queue-support~=1.7.0

python3_cyberfusion_file_support-1.3/src/python3_cyberfusion_file_support.egg-info/requires.txt

@@ -1,2 +0,0 @@
-python3-cyberfusion-common~=2.0
-python3-cyberfusion-queue-support~=1.3