brett/Zordon
1
0
Fork 0
mirror of https://github.com/blw1138/Zordon.git synced 2025-12-17 08:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Code cleanup

Browse Source
This commit is contained in:
Brett Williams
2023-06-03 17:06:09 -05:00
parent a9257a6bf5
commit 43a1698ab8
2 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/server/job_server.py
View File

@@ -20,7 +20,8 @@ from lib.server.zeroconf_server import ZeroconfServer
from lib.render_queue import RenderQueue, JobNotFoundError from lib.render_queue import RenderQueue, JobNotFoundError
from lib.render_workers.worker_factory import RenderWorkerFactory from lib.render_workers.worker_factory import RenderWorkerFactory
from lib.render_workers.base_worker import string_to_status, RenderStatus 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() logger = logging.getLogger()
server = Flask(__name__, template_folder='templates', static_folder='static') 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: try:
logger.info(f"Uploading file {input_path} to client {client}") logger.info(f"Uploading file {input_path} to client {client}")
job_data = request.json 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: if response.ok:
logger.info("Job submitted successfully!") logger.info("Job submitted successfully!")
return response.json() if response.json() else "Job ok" return response.json() if response.json() else "Job ok"

9
lib/utilities/server_helper.py
View File

@@ -12,15 +12,6 @@ from lib.render_workers.base_worker import RenderStatus
logger = logging.getLogger() 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): def generate_thumbnail_for_job(job, thumb_video_path, thumb_image_path, max_width=320):
# Simple thread to generate thumbs in background # Simple thread to generate thumbs in background