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

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

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 1.6
+Version: 2.0
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support
 Description-Content-Type: text/markdown
 Requires-Dist: python3-cyberfusion-systemd-support~=2.1
+Requires-Dist: alembic==1.8.1
+Requires-Dist: SQLAlchemy==1.4.46
 
 # python3-cyberfusion-queue-support
 

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python3-cyberfusion-queue-support"
-version = "1.6"
+version = "2.0"
 description = "Library to queue actions."
 readme = "README.md"
 authors = [
@@ -12,6 +12,8 @@ authors = [
 ]
 dependencies = [
     "python3-cyberfusion-systemd-support~=2.1",
+    "alembic==1.8.1",
+    "SQLAlchemy==1.4.46",
 ]
 
 [project.urls]

python3_cyberfusion_queue_support-2.0/src/cyberfusion/QueueSupport/__init__.py

@@ -0,0 +1,150 @@
+"""Classes for queue."""
+
+import logging
+from copy import copy
+from dataclasses import dataclass
+from typing import List
+
+from cyberfusion.QueueSupport.database import (
+    Queue as QueueModel,
+    QueueItem,
+    make_database_session,
+    QueueItemOutcome,
+    QueueProcess,
+)
+from cyberfusion.QueueSupport.exceptions import QueueFulfillFailed
+from cyberfusion.QueueSupport.interfaces import OutcomeInterface
+from cyberfusion.QueueSupport.items import _Item
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass
+class QueueItemMapping:
+    """Queue item mapping."""
+
+    item: _Item
+    database_object: QueueItem
+
+
+class Queue:
+    """Represents queue."""
+
+    def __init__(self) -> None:
+        """Set attributes."""
+        self.item_mappings: List[QueueItemMapping] = []
+
+        self._database_session = make_database_session()
+
+        object_ = QueueModel()
+
+        self._database_session.add(object_)
+        self._database_session.commit()
+
+        self.queue_database_object = object_
+
+    def add(self, item: _Item, *, run_duplicate_last: bool = True) -> None:
+        """Add item to queue."""
+        deduplicated = False
+
+        existing_item_index = next(
+            (
+                index
+                for index, item_mapping in enumerate(self.item_mappings)
+                if item_mapping.item == item
+            ),
+            None,
+        )
+
+        if existing_item_index is not None:
+            if run_duplicate_last:
+                self.item_mappings[
+                    existing_item_index
+                ].database_object.deduplicated = True
+
+                self._database_session.commit()
+            else:
+                deduplicated = True
+
+        item_dict = copy(item.__dict__)
+
+        del item_dict["_reference"]
+        del item_dict["_hide_outcomes"]
+
+        object_ = QueueItem(
+            queue=self.queue_database_object,
+            type=item.__class__.__name__,
+            reference=item.reference,
+            hide_outcomes=item.hide_outcomes,
+            deduplicated=deduplicated,
+            attributes=item_dict,
+        )
+
+        self._database_session.add(object_)
+        self._database_session.commit()
+
+        self.item_mappings.append(QueueItemMapping(item, object_))
+
+    def process(self, preview: bool) -> List[OutcomeInterface]:
+        """Process items."""
+        logger.debug("Processing items")
+
+        process_object = QueueProcess(
+            queue_id=self.queue_database_object.id,
+            preview=preview,
+        )
+
+        self._database_session.add(process_object)
+        self._database_session.commit()
+
+        outcomes = []
+
+        for item_mapping in [
+            item_mapping
+            for item_mapping in self.item_mappings
+            if not item_mapping.database_object.deduplicated
+        ]:
+            logger.debug(
+                "Processing item with id '%s'", item_mapping.database_object.id
+            )
+
+            if preview:
+                if not item_mapping.item.hide_outcomes:
+                    outcomes.extend(item_mapping.item.outcomes)
+            else:
+                try:
+                    logger.debug(
+                        "Fulfilling item with id '%s'", item_mapping.database_object.id
+                    )
+
+                    fulfill_outcomes = item_mapping.item.fulfill()
+
+                    if not item_mapping.item.hide_outcomes:
+                        outcomes.extend(fulfill_outcomes)
+
+                    logger.debug(
+                        "Fulfilled item with id '%s'", item_mapping.database_object.id
+                    )
+                except QueueFulfillFailed:
+                    raise
+                except Exception as e:
+                    raise QueueFulfillFailed(
+                        item_mapping.item,
+                    ) from e
+
+            for outcome in outcomes:
+                outcome_object = QueueItemOutcome(
+                    queue_item=item_mapping.database_object,
+                    queue_process=process_object,
+                    type=outcome.__class__.__name__,
+                    attributes=outcome.__dict__,
+                )
+
+                self._database_session.add(outcome_object)
+                self._database_session.commit()
+
+            logger.debug("Processed item with id '%s'", item_mapping.database_object.id)
+
+        logger.debug("Processed items")
+
+        return outcomes

python3_cyberfusion_queue_support-2.0/src/cyberfusion/QueueSupport/database.py

@@ -0,0 +1,106 @@
+import os
+import sqlite3
+from datetime import datetime, timezone
+from sqlalchemy.pool.base import _ConnectionRecord
+from sqlalchemy import ForeignKey, MetaData, Boolean
+from sqlalchemy import create_engine, Column, DateTime, Integer, String
+from sqlalchemy.orm import Session, sessionmaker, relationship
+from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.engine import Engine
+from sqlalchemy import event
+from sqlalchemy.types import JSON
+
+
+@event.listens_for(Engine, "connect")  # type: ignore[misc]
+def set_sqlite_pragma(
+    dbapi_connection: sqlite3.Connection, connection_record: _ConnectionRecord
+) -> None:
+    """Enable foreign key support.
+
+    This is needed for cascade deletes to work.
+
+    See https://docs.sqlalchemy.org/en/13/dialects/sqlite.html#sqlite-foreign-keys
+    """
+    cursor = dbapi_connection.cursor()
+
+    cursor.execute("PRAGMA foreign_keys=ON")
+
+    cursor.close()
+
+
+def get_database_path() -> str: # pragma: no cover
+    """Get database path."""
+    return os.path.join(os.path.sep, "var", "lib", "queue-support.db")
+
+
+def make_database_session() -> Session:
+    engine = create_engine(
+        "sqlite:///" + get_database_path(), connect_args={"check_same_thread": False}
+    )
+
+    return sessionmaker(bind=engine)()
+
+
+naming_convention = {
+    "ix": "ix_%(column_0_label)s",
+    "uq": "uq_%(table_name)s_%(column_0_name)s",
+    "ck": "ck_%(table_name)s_%(constraint_name)s",
+    "fk": "fk_%(table_name)s_%(column_0_name)s_%(referred_table_name)s",
+    "pk": "pk_%(table_name)s",
+}
+
+metadata = MetaData(naming_convention=naming_convention)
+
+Base = declarative_base(metadata=metadata)
+
+
+class BaseModel(Base):  # type: ignore[misc, valid-type]
+    """Base model."""
+
+    __abstract__ = True
+
+    id = Column(Integer, primary_key=True)
+    created_at = Column(DateTime, default=datetime.now(timezone.utc), nullable=False)
+
+
+class Queue(BaseModel):
+    """Queue model."""
+
+    __tablename__ = "queues"
+
+
+class QueueProcess(BaseModel):
+    """QueueProcess model."""
+
+    __tablename__ = "queue_processes"
+
+    queue_id = Column(Integer, ForeignKey("queues.id"), nullable=False)
+    queue = relationship("Queue")
+    preview = Column(Boolean, nullable=False)
+
+
+class QueueItem(BaseModel):
+    """QueueItem model."""
+
+    __tablename__ = "queue_items"
+
+    queue_id = Column(Integer, ForeignKey("queues.id"), nullable=False)
+    queue = relationship("Queue")
+    type = Column(String(length=255), nullable=False)
+    reference = Column(String(length=255), nullable=True)
+    hide_outcomes = Column(Boolean, nullable=False)
+    deduplicated = Column(Boolean, nullable=False)
+    attributes = Column(JSON, nullable=False)
+
+
+class QueueItemOutcome(BaseModel):
+    """QueueItemOutcome model."""
+
+    __tablename__ = "queue_item_outcomes"
+
+    queue_item_id = Column(Integer, ForeignKey("queue_items.id"), nullable=False)
+    queue_item = relationship("QueueItem")
+    queue_process_id = Column(Integer, ForeignKey("queue_processes.id"), nullable=False)
+    queue_process = relationship("QueueProcess")
+    type = Column(String(length=255), nullable=False)
+    attributes = Column(JSON, nullable=False)

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/interfaces.py

@@ -28,7 +28,7 @@ class ItemInterface(metaclass=ABCMeta):
         pass
 
     @abstractmethod
-    def fulfill(self) -> None:  # pragma: no cover
+    def fulfill(self) -> List[OutcomeInterface]:  # pragma: no cover
         """Fulfill outcomes."""
         pass
 

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/__init__.py

@@ -1,6 +1,7 @@
 """Items."""
 
 import logging
+from abc import ABC, abstractmethod
 from typing import Optional
 
 from cyberfusion.QueueSupport.interfaces import ItemInterface
@@ -8,9 +9,20 @@ from cyberfusion.QueueSupport.interfaces import ItemInterface
 logger = logging.getLogger(__name__)
 
 
-class _Item(ItemInterface):
+class _Item(ItemInterface, ABC):
     """Represents base item."""
 
+    @abstractmethod
+    def __init__(
+        self,
+        *,
+        reference: Optional[str] = None,
+        hide_outcomes: bool = False,
+    ) -> None: # pragma: no cover
+        """Set attributes."""
+        self._reference = reference
+        self._hide_outcomes = hide_outcomes
+
     @property
     def hide_outcomes(self) -> bool:
         """Get if outcomes should be hidden."""

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/chmod.py

@@ -56,11 +56,15 @@ class ChmodItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[ChmodItemModeChangeOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             os.chmod(outcome.path, outcome.new_mode)
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, ChmodItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/chown.py

@@ -106,9 +106,13 @@ class ChownItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(
+        self,
+    ) -> List[ChownItemOwnerChangeOutcome | ChownItemGroupChangeOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             if isinstance(outcome, ChownItemOwnerChangeOutcome):
                 os.chown(
                     outcome.path,
@@ -122,6 +126,8 @@ class ChownItem(_Item):
                     gid=get_gid(outcome.new_group_name),
                 )
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, ChownItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/command.py

@@ -35,9 +35,11 @@ class CommandItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[CommandItemRunOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             try:
                 output = subprocess.run(
                     outcome.command,
@@ -53,6 +55,8 @@ class CommandItem(_Item):
                     self, command=outcome.command, stdout=e.stdout, stderr=e.stderr
                 ) from e
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, CommandItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.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,
@@ -80,11 +94,15 @@ class CopyItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[CopyItemCopyOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             shutil.copyfile(outcome.source, outcome.destination)
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, CopyItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/mkdir.py

@@ -43,11 +43,15 @@ class MkdirItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[MkdirItemCreateOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             os.mkdir(outcome.path)
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, MkdirItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/move.py

@@ -46,11 +46,15 @@ class MoveItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[MoveItemMoveOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             shutil.move(outcome.source, outcome.destination)
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, MoveItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/rmtree.py

@@ -44,11 +44,15 @@ class RmTreeItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[RmTreeItemRemoveOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             shutil.rmtree(outcome.path)
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, RmTreeItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_daemon_reload.py

@@ -35,11 +35,15 @@ class SystemdDaemonReloadItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdDaemonReloadItemReloadOutcome]:
         """Fulfill outcomes."""
-        for _ in self.outcomes:
+        outcomes = self.outcomes
+
+        for _ in outcomes:
             SystemdManager.daemon_reload()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdDaemonReloadItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_tmp_files_create.py

@@ -36,11 +36,15 @@ class SystemdTmpFilesCreateItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdTmpFilesCreateItemCreateOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             TmpFileConfigurationFile(outcome.path).create()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdTmpFilesCreateItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_unit_disable.py

@@ -39,11 +39,15 @@ class SystemdUnitDisableItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdUnitDisableItemDisableOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             outcome.unit.disable()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdUnitDisableItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_unit_enable.py

@@ -39,11 +39,15 @@ class SystemdUnitEnableItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdUnitEnableItemEnableOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             outcome.unit.enable()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdUnitEnableItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_unit_reload.py

@@ -38,11 +38,15 @@ class SystemdUnitReloadItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdUnitReloadItemReloadOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             outcome.unit.reload()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdUnitReloadItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_unit_restart.py

@@ -38,11 +38,15 @@ class SystemdUnitRestartItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdUnitRestartItemRestartOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             outcome.unit.restart()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdUnitRestartItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_unit_start.py

@@ -39,11 +39,15 @@ class SystemdUnitStartItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdUnitStartItemStartOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             outcome.unit.start()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdUnitStartItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/systemd_unit_stop.py

@@ -37,11 +37,15 @@ class SystemdUnitStopItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[SystemdUnitStopItemStopOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             outcome.unit.stop()
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, SystemdUnitStopItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/cyberfusion/QueueSupport/items/unlink.py

@@ -43,11 +43,15 @@ class UnlinkItem(_Item):
 
         return outcomes
 
-    def fulfill(self) -> None:
+    def fulfill(self) -> List[UnlinkItemUnlinkOutcome]:
         """Fulfill outcomes."""
-        for outcome in self.outcomes:
+        outcomes = self.outcomes
+
+        for outcome in outcomes:
             os.unlink(outcome.path)
 
+        return outcomes
+
     def __eq__(self, other: object) -> bool:
         """Get equality based on attributes."""
         if not isinstance(other, UnlinkItem):

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.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-2.0}/src/python3_cyberfusion_queue_support.egg-info/PKG-INFO

@@ -1,11 +1,13 @@
 Metadata-Version: 2.4
 Name: python3-cyberfusion-queue-support
-Version: 1.6
+Version: 2.0
 Summary: Library to queue actions.
 Author-email: Cyberfusion <support@cyberfusion.io>
 Project-URL: Source, https://github.com/CyberfusionIO/python3-cyberfusion-queue-support
 Description-Content-Type: text/markdown
 Requires-Dist: python3-cyberfusion-systemd-support~=2.1
+Requires-Dist: alembic==1.8.1
+Requires-Dist: SQLAlchemy==1.4.46
 
 # python3-cyberfusion-queue-support
 

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/python3_cyberfusion_queue_support.egg-info/SOURCES.txt

@@ -2,6 +2,7 @@ README.md
 pyproject.toml
 setup.cfg
 src/cyberfusion/QueueSupport/__init__.py
+src/cyberfusion/QueueSupport/database.py
 src/cyberfusion/QueueSupport/interfaces.py
 src/cyberfusion/QueueSupport/outcomes.py
 src/cyberfusion/QueueSupport/utilities.py

{python3_cyberfusion_queue_support-1.6 → python3_cyberfusion_queue_support-2.0}/src/python3_cyberfusion_queue_support.egg-info/requires.txt

@@ -1 +1,3 @@
 python3-cyberfusion-systemd-support~=2.1
+alembic==1.8.1
+SQLAlchemy==1.4.46

python3_cyberfusion_queue_support-1.6/src/cyberfusion/QueueSupport/__init__.py

@@ -1,72 +0,0 @@
-"""Classes for queue."""
-
-import logging
-from typing import List
-
-from cyberfusion.QueueSupport.exceptions import QueueFulfillFailed
-from cyberfusion.QueueSupport.interfaces import OutcomeInterface
-from cyberfusion.QueueSupport.items import _Item
-
-logger = logging.getLogger(__name__)
-
-
-class Queue:
-    """Represents queue."""
-
-    def __init__(self) -> None:
-        """Set attributes."""
-        self.items: List[_Item] = []
-
-    def add(self, item: _Item, *, move_duplicate_last: bool = True) -> None:
-        """Add item to queue."""
-        if item not in self.items:
-            self.items.append(item)
-
-            logger.info("Added item to queue (reference: '%s')", item.reference)
-        else:
-            # If item already in queue, move to last place
-
-            if move_duplicate_last:
-                self.items.append(self.items.pop(self.items.index(item)))
-
-                logger.info(
-                    "Added item to queue (reference: '%s') (moving duplicate last)",
-                    item.reference,
-                )
-            else:
-                logger.info(
-                    "Didn't add item to queue (reference: '%s') (already present)",
-                    item.reference,
-                )
-
-    def process(self, preview: bool) -> List[OutcomeInterface]:
-        """Process items."""
-        logger.info("Processing items")
-
-        results = []
-
-        for item in self.items:
-            logger.info("Processing item '%s'", item.reference)
-
-            if not item.hide_outcomes:
-                results.extend(item.outcomes)
-
-            if not preview:
-                try:
-                    logger.info("Fulfilling item '%s'", item.reference)
-
-                    item.fulfill()
-
-                    logger.info("Fulfilled item '%s'", item.reference)
-                except QueueFulfillFailed:
-                    raise
-                except Exception as e:
-                    raise QueueFulfillFailed(
-                        item,
-                    ) from e
-
-            logger.info("Processed item '%s'", item.reference)
-
-        logger.info("Processed items")
-
-        return results