Code cleanup

lib/server/job_server.py

@@ -20,7 +20,8 @@ from lib.server.zeroconf_server import ZeroconfServer
 from lib.render_queue import RenderQueue, JobNotFoundError
 from lib.render_workers.worker_factory import RenderWorkerFactory
 from lib.render_workers.base_worker import string_to_status, RenderStatus
-from lib.utilities.server_helper import post_job_to_server, generate_thumbnail_for_job
+from lib.utilities.server_helper import generate_thumbnail_for_job
+from lib.server.server_proxy import RenderServerProxy
 
 logger = logging.getLogger()
 server = Flask(__name__, template_folder='templates', static_folder='static')
@@ -384,7 +385,7 @@ def add_job(job_params, remove_job_dir_on_failure=False):
             try:
                 logger.info(f"Uploading file {input_path} to client {client}")
                 job_data = request.json
-                response = post_job_to_server(input_path, job_data, client.hostname)
+                response = RenderServerProxy(hostname=client.hostname).post_job_to_server(input_path, job_data)
                 if response.ok:
                     logger.info("Job submitted successfully!")
                     return response.json() if response.json() else "Job ok"

lib/utilities/server_helper.py

@@ -12,15 +12,6 @@ from lib.render_workers.base_worker import RenderStatus
 logger = logging.getLogger()
 
 
-def post_job_to_server(input_path, job_list, hostname, server_port=8080):
-    # Pack job data and submit to server
-    job_files = {'file': (os.path.basename(input_path), open(input_path, 'rb'), 'application/octet-stream'),
-                 'json': (None, json.dumps(job_list), 'application/json')}
-
-    req = requests.post(f'http://{hostname}:{server_port}/api/add_job', files=job_files)
-    return req
-
-
 def generate_thumbnail_for_job(job, thumb_video_path, thumb_image_path, max_width=320):
 
     # Simple thread to generate thumbs in background