microtechno9000
diff --git a/‎VERSION‎
Lines changed: 1 addition & 1 deletion b/‎VERSION‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎arm/migrations/versions/2986d3f7ecf9_extended_optical_drive_info.py‎
Lines changed: 49 additions & 0 deletions b/‎arm/migrations/versions/2986d3f7ecf9_extended_optical_drive_info.py‎
Lines changed: 49 additions & 0 deletions
diff --git a/‎arm/migrations/versions/5ceacc391408_store_makemkv_disc_id.py‎
Lines changed: 25 additions & 0 deletions b/‎arm/migrations/versions/5ceacc391408_store_makemkv_disc_id.py‎
Lines changed: 25 additions & 0 deletions
diff --git a/‎arm/migrations/versions/a79af75f4b31_add_drive_id_field.py‎
Lines changed: 26 additions & 0 deletions b/‎arm/migrations/versions/a79af75f4b31_add_drive_id_field.py‎
Lines changed: 26 additions & 0 deletions
diff --git a/‎arm/models/__init__.py‎
Lines changed: 12 additions & 1 deletion b/‎arm/models/__init__.py‎
Lines changed: 12 additions & 1 deletion
diff --git a/‎arm/models/job.py‎
Lines changed: 125 additions & 15 deletions b/‎arm/models/job.py‎
Lines changed: 125 additions & 15 deletions
@@ -1 +1 @@
-2.16.1
+2.17.0
@@ -0,0 +1,49 @@
+"""Extended Optical Drive Info
+
+Revision ID: 2986d3f7ecf9
+Revises: 6870a5546912
+Create Date: 2024-11-27 10:15:32.678332
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# pylint: disable=no-member
+
+# revision identifiers, used by Alembic.
+revision = '2986d3f7ecf9'
+down_revision = '6870a5546912'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.drop_column('system_drives', 'type')  # can be generated
+    op.drop_column('system_drives', 'open')  # cannot be treated as stateless
+    # new static information
+    op.add_column('system_drives', sa.Column('maker', sa.String(25)))
+    op.add_column('system_drives', sa.Column('model', sa.String(50)))
+    op.add_column('system_drives', sa.Column('serial', sa.String(25)))
+    op.add_column('system_drives', sa.Column('connection', sa.String(5)))
+    op.add_column('system_drives', sa.Column('read_cd', sa.Boolean))
+    op.add_column('system_drives', sa.Column('read_dvd', sa.Boolean))
+    op.add_column('system_drives', sa.Column('read_bd', sa.Boolean))
+    # new dynamic information
+    op.add_column('system_drives', sa.Column('firmware', sa.String(10)))
+    op.add_column('system_drives', sa.Column('location', sa.String(255)))
+    op.add_column('system_drives', sa.Column('stale', sa.Boolean))
+
+
+def downgrade():
+    op.add_column('system_drives', sa.Column('type', sa.String(20)))
+    op.add_column('system_drives', sa.Column('open', sa.Column(sa.Boolean)))
+    op.drop_column('system_drives', 'maker')
+    op.drop_column('system_drives', 'model')
+    op.drop_column('system_drives', 'serial')
+    op.drop_column('system_drives', 'connection')
+    op.drop_column('system_drives', 'read_cd')
+    op.drop_column('system_drives', 'read_dvd')
+    op.drop_column('system_drives', 'read_bd')
+    op.drop_column('system_drives', 'firmware')
+    op.drop_column('system_drives', 'location')
+    op.drop_column('system_drives', 'stale')
@@ -0,0 +1,25 @@
+"""Store MakeMKV disc id
+
+Revision ID: 5ceacc391408
+Revises: 2986d3f7ecf9
+Create Date: 2024-12-05 22:38:52.709850
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# pylint: disable=no-member
+
+# revision identifiers, used by Alembic.
+revision = '5ceacc391408'
+down_revision = '2986d3f7ecf9'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    op.add_column('system_drives', sa.Column('mdisc', sa.SmallInteger()))
+
+
+def downgrade():
+    op.drop_column('system_drives', 'mdisc')
@@ -0,0 +1,26 @@
+"""Add drive id field
+
+Revision ID: a79af75f4b31
+Revises: 5ceacc391408
+Create Date: 2025-01-04 14:39:09.972294
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+# pylint: disable=no-member
+
+# revision identifiers, used by Alembic.
+revision = 'a79af75f4b31'
+down_revision = '5ceacc391408'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # new static information
+    op.add_column('system_drives', sa.Column('serial_id', sa.String(100)))
+
+
+def downgrade():
+    op.drop_column('system_drives', 'serial_id')
@@ -1 +1,12 @@
-#!/usr/bin/env python3
+"""Database Models
+"""
+
+from .alembic_version import AlembicVersion  # noqa F401
+from .config import Config  # noqa F401
+from .job import Job, JobState  # noqa F401
+from .notifications import Notifications  # noqa F401
+from .system_drives import SystemDrives  # noqa F401
+from .system_info import SystemInfo  # noqa F401
+from .track import Track  # noqa F401
+from .ui_settings import UISettings  # noqa F401
+from .user import User  # noqa F401
@@ -1,11 +1,15 @@
+import enum
 import logging
 import os
 import psutil
 import pyudev
 import subprocess
 import time
 
+from datetime import datetime as dt
 from prettytable import PrettyTable
+from sqlalchemy.ext.hybrid import hybrid_property
+
 from arm.ripper import music_brainz
 from arm.ui import db
 import arm.config.config as cfg
@@ -15,6 +19,67 @@
 from arm.models.config import Config  # noqa: F401
 
 
+class JobState(str, enum.Enum):
+    """Possible states for Job.status.
+
+    The origin of the states is getting unclear at this point. Therefore, the
+    possible `Job.status` states are defined as fixed enums to handle and group
+    them better. Some come from CD, some from DVD ripping.
+
+    Note: The timestamps could also be saved particularily for each step to
+          show, for example, the pure transcoding time without the waiting
+          time.
+    """
+
+    # Job Finished States
+    SUCCESS = "success"
+    FAILURE = "fail"
+
+    # Manual wait (see job.config.MANUAL_WAIT)
+    MANUAL_WAIT_STARTED = "waiting"
+
+    # Job Initialized or Pending
+    IDLE = "active"
+    """An Idle Job may proceed to ripping or to finished.
+
+    - When initializing a job, the job is set to active
+    - After Handbrake finishes, Job is set to active
+    - After ABCD finishes, Job is set to active
+    """
+
+    # Video Ripping States
+    VIDEO_RIPPING = "ripping"
+    """Indicate that makemkv is ripping."""
+    VIDEO_WAITING = "waiting"
+    """Indicate that the job waits for user input or for the next queue slot."""
+    VIDEO_INFO = "info"
+    """Indicate that the job calls makemkv info"""
+
+    # Audio ripping states
+    AUDIO_RIPPING = "ripping"
+
+    # Transcoding states
+    TRANSCODE_ACTIVE = "transcoding"
+    TRANSCODE_WAITING = "waiting_transcode"
+
+
+JOB_STATUS_FINISHED = {
+    JobState.SUCCESS,
+    JobState.FAILURE,
+}
+JOB_STATUS_RIPPING = {
+    JobState.AUDIO_RIPPING,
+    JobState.VIDEO_RIPPING,
+    JobState.MANUAL_WAIT_STARTED,  # <-- not ripping, but undistinguishable
+    JobState.VIDEO_WAITING,
+    JobState.VIDEO_INFO,
+}
+JOB_STATUS_TRANSCODING = {
+    JobState.TRANSCODE_ACTIVE,
+    JobState.TRANSCODE_WAITING,
+}
+
+
 class Job(db.Model):
     """
     Job Class hold most of the details for each job
@@ -28,6 +93,12 @@ class Job(db.Model):
     stop_time = db.Column(db.DateTime)
     job_length = db.Column(db.String(12))
     status = db.Column(db.String(32))
+    """Now that we have JobState, we should migrate this column.
+    status = db.Column(
+        db.Enum(JobState, name="job_state_enum", native_enum=False, validate_strings=True),
+        nullable=False
+    )
+    """
     stage = db.Column(db.String(63))
     no_of_titles = db.Column(db.Integer)
     title = db.Column(db.String(256))
@@ -211,21 +282,60 @@ def get_d(self):
         return return_dict
 
     def eject(self):
-        """Eject disc if it hasn't previously been ejected"""
+        """Eject disc if it hasn't previously been ejected
+        """
+        if self.ejected:
+            logging.debug("The drive associated with this job has already been ejected.")
+            return
+        if self.drive is None:
+            logging.warning("No drive was backpopulated with this job!")
+            return
         if not cfg.arm_config['AUTO_EJECT']:
             logging.info("Skipping auto eject")
+            self.drive.release_current_job()
             return
-        if not self.ejected:
-            self.ejected = True
-            try:
-                # This might always return true
-                if bool(os.system("umount " + self.devpath)):
-                    logging.debug(f"Unmounted disc {self.devpath}")
-                else:
-                    logging.debug(f"Failed to unmount {self.devpath}")
-                if bool(os.system("eject -sv " + self.devpath)):
-                    logging.debug(f"Ejected disc {self.devpath}")
-                else:
-                    logging.debug(f"Failed to eject {self.devpath}")
-            except Exception as error:
-                logging.debug(f"{self.devpath} couldn't be ejected {error}")
+        if (error := self.drive.eject(method="eject", logger=logging)) is not None:
+            logging.debug(f"{self.devpath} couldn't be ejected: {error}")
+        self.ejected = True
+
+    @hybrid_property
+    def finished(self):
+        return JobState(self.status) in JOB_STATUS_FINISHED
+
+    @finished.expression
+    def finished(cls):
+        return cls.status.in_([js.value for js in JOB_STATUS_FINISHED])
+
+    @property
+    def idle(self):
+        return JobState(self.status) == JobState.IDLE
+
+    @property
+    def ripping(self):
+        return JobState(self.status) in JOB_STATUS_RIPPING
+
+    @property
+    def run_time(self):
+        return abs(dt.now() - self.start_time).total_seconds()
+
+    @property
+    def ripping_finished(self):
+        """Indicates that the ripping process has finished.
+
+        Note: This usually means that we are transcoding and the drive is not
+              currently used.
+        """
+        if self.finished:
+            logging.info("Job is finished.")
+            return True
+        if not self.ripping:
+            logging.info("Job is not ripping.")
+            return True
+        if self.drive is None:
+            logging.info("No drive was backpopulated with this job!")
+            return True
+        if self.ejected:
+            logging.info(f"Drive {self.devpath} was ejected. No ripping process active.")
+            return True
+        logging.info(f"Job is ripping {self.devpath}.")
+        return False