Update to the model for show_id support

dashboard/dashboard.py

@@ -231,7 +231,8 @@ def shots_start():
 def shots_add():
     if request.method == 'POST':
         shot_values = {
-            'production_shot_id': 1,
+            'attract_shot_id': 1,
+            'show_id': request.form['show_id'],
             'shot_name': request.form['shot_name'],
             'frame_start': request.form['frame_start'],
             'frame_end': request.form['frame_end'],

dashboard/templates/add_shot_modal.html

 <form id="addShot" role="form" action="{{ url_for('shots_add') }}" method=post>
+  <input type="hidden" name="show_id" value="{{settings['active_show']}}">
   <!-- <div class="row">
     <div class="col-md-6">
       <div class="form-group">

server/model.py

@@ -52,6 +52,7 @@ class Shots(BaseModel):
     * via a query from an external software (e.g. Attract)
     """
     attract_shot_id = IntegerField()
+    show_id = IntegerField()
     frame_start = IntegerField()
     frame_end = IntegerField()
     chunk_size = IntegerField()

server/modules/jobs.py

@@ -79,17 +79,22 @@ def start_job(worker, job):
     """
 
     shot = Shots.get(Shots.id == job.shot_id)
+    show = Shows.get(Shows.id == shot.show_id)
+
+    filepath = shot.filepath
 
     if 'Darwin' in worker.system:
         setting_blender_path = Settings.get(
             Settings.name == 'blender_path_osx')
         setting_render_settings = Settings.get(
             Settings.name == 'render_settings_path_osx')
+        filepath = os.path.join(show.path_osx, shot.filepath)
     else:
         setting_blender_path = Settings.get(
             Settings.name == 'blender_path_linux')
         setting_render_settings = Settings.get(
             Settings.name == 'render_settings_path_linux')
+        filepath = os.path.join(show.path_linux, shot.filepath)
 
     blender_path = setting_blender_path.value
     render_settings = os.path.join(
@@ -109,7 +114,7 @@ def start_job(worker, job):
     """
 
     params = {'job_id': job.id,
-              'file_path': shot.filepath,
+              'file_path': filepath,
               'blender_path': blender_path,
               'render_settings': render_settings,
               'start': job.chunk_start,

server/modules/shots.py

@@ -180,6 +180,7 @@ def shot_add():
 
     shot = Shots.create(
         attract_shot_id=1,
+        show_id=int(request.form['show_id']),
         frame_start=int(request.form['frame_start']),
         frame_end=int(request.form['frame_end']),
         chunk_size=int(request.form['chunk_size']),