ddp/photoassistant
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed pass* from jobs

Browse Source
This commit is contained in:
Damien De Paoli
2021-01-20 16:34:56 +11:00
parent 0de95d56d5
commit 4be0ef2a73
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
job.py
View File

@@ -38,8 +38,6 @@ class Job(db.Model):
last_update = db.Column(db.DateTime(timezone=True)) last_update = db.Column(db.DateTime(timezone=True))
name = db.Column(db.String) name = db.Column(db.String)
state = db.Column(db.String) state = db.Column(db.String)
num_passes = db.Column(db.Integer)
current_pass = db.Column(db.Integer)
num_files = db.Column(db.Integer) num_files = db.Column(db.Integer)
current_file_num = db.Column(db.Integer) current_file_num = db.Column(db.Integer)
current_file = db.Column(db.String) current_file = db.Column(db.String)
@@ -50,7 +48,7 @@ class Job(db.Model):
logs = db.relationship( "Joblog") logs = db.relationship( "Joblog")
def __repr__(self): def __repr__(self):
return "<id: {}, start_time: {}, last_update: {}, name: {}, state: {}, num_passes: {}, current_pass: {}, num_files: {}, current_file_num: {}, current_file: {}, pa_job_state: {}, wait_for: {}, extra: {}, logs: {}>".format(self.id, self.start_time, self.last_update, self.name, self.state, self.num_passes, self.current_pass, self.num_files, self.current_file_num, self.current_file, self.pa_job_state, self.wait_for, self.extra, self.logs) return "<id: {}, start_time: {}, last_update: {}, name: {}, state: {}, num_files: {}, current_file_num: {}, current_file: {}, pa_job_state: {}, wait_for: {}, extra: {}, logs: {}>".format(self.id, self.start_time, self.last_update, self.name, self.state, self.num_files, self.current_file_num, self.current_file, self.pa_job_state, self.wait_for, self.extra, self.logs)
################################################################################ ################################################################################
@@ -75,9 +73,9 @@ def WakePAJobManager():
# NewJob takes a name (which will be matched in pa_job_manager.py to run # NewJob takes a name (which will be matched in pa_job_manager.py to run
# the appropriate job - which will update the Job() until complete # the appropriate job - which will update the Job() until complete
############################################################################### ###############################################################################
def NewJob(name, num_passes="1", num_files="0", wait_for=None ): def NewJob(name, num_files="0", wait_for=None ):
job=Job(start_time='now()', last_update='now()', name=name, state="New", num_passes=num_passes, num_files=num_files, job=Job(start_time='now()', last_update='now()', name=name, state="New", num_files=num_files,
current_pass=0, current_file_num=0, current_file='', current_file_num=0, current_file='',
wait_for=wait_for, pa_job_state="New" ) wait_for=wait_for, pa_job_state="New" )
db.session.add(job) db.session.add(job)
db.session.commit() db.session.commit()