From db056e08aa15841d909e13eed19b145e366dcfe3 Mon Sep 17 00:00:00 2001
From: Damien De Paoli <ddp@depaoli.id.au>
Date: Thu, 21 Jan 2021 00:58:02 +1100
Subject: [PATCH] remove pa_job_manager table, its not needed, and fixed bug
 where Gen hash optimisation did not finish job when it shoud have

---
 pa_job_manager.py | 41 ++++++-----------------------------------
 1 file changed, 6 insertions(+), 35 deletions(-)

diff --git a/pa_job_manager.py b/pa_job_manager.py
index eee2ed7..7dbb5dd 100644
--- a/pa_job_manager.py
+++ b/pa_job_manager.py
@@ -51,9 +51,6 @@ session = Session()
 Base = declarative_base()
 
 
-# global for us to keep state / let front-end know our state
-pa_eng=None
-
 ################################################################################
 # Class describing File in the database, and via sqlalchemy, connected to the DB as well
 # This has to match one-for-one the DB table
@@ -120,20 +117,9 @@ class Settings(Base):
 
 ################################################################################
 # classes for the job manager:
-#    PA_JobManager overall status tracking), 
-#    Job (and Joblog) for each JOb, and 
+#    Job (and Joblog, JobExtra) for each Job, and 
 #    PA_Jobmanager_fe_message (to pass messages to the front-end web)
 ################################################################################
-class PA_JobManager(Base):
-    __tablename__ = "pa_job_manager"
-    id = Column(Integer, Sequence('pa_job_manager_id_seq'), primary_key=True)
-    state = Column(String)
-    num_active_jobs = Column(Integer)
-    num_completed_jobs = Column(Integer)
-
-    def __repr__(self):
-        return "<id={}, state={}, num_active_jobs={}, num_completed_jobs={}>".format( self.id, self.state, self.num_active_jobs, self.num_completed_jobs )
-
 class Joblog(Base):
     __tablename__ = "joblog"
     id = Column(Integer, Sequence('joblog_id_seq'), primary_key=True )
@@ -182,21 +168,14 @@ class PA_JobManager_FE_Message(Base):
     def __repr__(self):
         return "<id: {}, job_id: {}, alert: {}, message: {}".format(self.id, self.job_id, self.alert, self.message)
 
+##############################################################################
+# Util (non Class) functions
 ##############################################################################
 def MessageToFE( job_id, alert, message ):
     msg = PA_JobManager_FE_Message( job_id=job_id, alert=alert, message=message)
     session.add(msg)
     session.commit()
 
-def InitialiseManager():
-    global pa_eng
-
-    pa_eng=session.query(PA_JobManager).first()
-    if( pa_eng == None ):
-        pa_eng = PA_JobManager(state='Initialising', num_active_jobs=0, num_completed_jobs=0 )
-        session.add(pa_eng)
-    return
-
 def ProcessImportDirs(parent_job=None):
     settings = session.query(Settings).first()
     if settings == None:
@@ -237,7 +216,7 @@ def AddLogForJob(job, message, current_file=''):
     return
 
 def RunJob(job):
-    session = Session()
+#    session = Session()
     if job.name =="scannow":
         JobScanNow(job)
     elif job.name =="forcescan":
@@ -261,10 +240,8 @@ def FinishJob(job, last_log, state="Completed", pa_job_state="Completed"):
     return
 
 def HandleJobs():
-    global pa_eng
 
     print("INFO: PA job manager is scanning for new jobs to process")
-    pa_eng.state = 'Scanning Jobs'
     for job in session.query(Job).all():
         if job.pa_job_state == 'New':
             if job.wait_for != None:
@@ -292,7 +269,6 @@ def HandleJobs():
                     except Exception as e2:
                         print("Failed to let front-end know, but back-end Failed to run job (id: {}, name: {} -- orig exep was: {}, this exception was: {})".format( job.id, job.name, e, e2) )
     print("INFO: PA job manager is waiting jobs")
-    pa_eng.state = 'Waiting for new Jobs'
     return
 
 def JobProgressState( job, state ):
@@ -492,7 +468,7 @@ def JobGetFileDetails(job):
             if stat.st_ctime < dir.last_hash_date:
                 session.add(dir)
                 dir.last_hash_date = time.time()
-                AddLogForJob(job, "skip {} as it has not changed since last hashing".format(dir.path_prefix))
+                FinishJob(job, "{} has not changed since last hashing - finished job".format(dir.path_prefix))
                 if DEBUG==1:
                     print ("DEBUG: skip this dir {} as it has not changed since last hashing".format(dir.path_prefix))
                 return
@@ -570,12 +546,7 @@ def GenVideoThumbnail(job, file):
 
 if __name__ == "__main__":
     print("INFO: PA job manager starting")
-    try:
-        InitialiseManager()
-        ProcessImportDirs()
-    except Exception as e:
-        print( "ERROR: Failed to initialise PA Job Manager: {}".format(e) )
-        session.rollback()
+    ProcessImportDirs()
     with socket.socket(socket.AF_INET, socket.SOCK_STREAM) as s:
         s.bind((PA_JOB_MANAGER_HOST, PA_JOB_MANAGER_PORT))
         s.listen()