diff --git a/dist/resolve-proxy-encoder-0.1.0.tar.gz b/dist/resolve-proxy-encoder-0.1.0.tar.gz new file mode 100644 index 0000000..4490dd1 Binary files /dev/null and b/dist/resolve-proxy-encoder-0.1.0.tar.gz differ diff --git a/dist/resolve_proxy_encoder-0.1.0-py3-none-any.whl b/dist/resolve_proxy_encoder-0.1.0-py3-none-any.whl new file mode 100644 index 0000000..4d5c334 Binary files /dev/null and b/dist/resolve_proxy_encoder-0.1.0-py3-none-any.whl differ diff --git a/resolve_proxy_encoder/__pycache__/__init__.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..0b6332c Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/__init__.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..4fb6525 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/checks.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/checks.cpython-310.pyc new file mode 100644 index 0000000..708cc6e Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/checks.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/checks.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/checks.cpython-36.pyc new file mode 100644 index 0000000..534e5a4 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/checks.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/cli.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/cli.cpython-310.pyc new file mode 100644 index 0000000..8733ec6 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/cli.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/cli.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/cli.cpython-36.pyc new file mode 100644 index 0000000..9d20615 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/cli.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/helpers.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/helpers.cpython-310.pyc new file mode 100644 index 0000000..a2b58f3 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/helpers.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/helpers.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/helpers.cpython-36.pyc new file mode 100644 index 0000000..8f18a2c Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/helpers.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/link_proxies.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/link_proxies.cpython-310.pyc new file mode 100644 index 0000000..c5c7cf1 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/link_proxies.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/link_proxies.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/link_proxies.cpython-36.pyc new file mode 100644 index 0000000..1bc06c9 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/link_proxies.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/python_get_resolve.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/python_get_resolve.cpython-310.pyc new file mode 100644 index 0000000..4d768d7 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/python_get_resolve.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/python_get_resolve.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/python_get_resolve.cpython-36.pyc new file mode 100644 index 0000000..b1c6592 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/python_get_resolve.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/resolve_queue_proxies.cpython-310.pyc b/resolve_proxy_encoder/__pycache__/resolve_queue_proxies.cpython-310.pyc new file mode 100644 index 0000000..0297cc3 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/resolve_queue_proxies.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/resolve_queue_proxies.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/resolve_queue_proxies.cpython-36.pyc new file mode 100644 index 0000000..d15f660 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/resolve_queue_proxies.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/__pycache__/start_workers.cpython-36.pyc b/resolve_proxy_encoder/__pycache__/start_workers.cpython-36.pyc new file mode 100644 index 0000000..ee112d1 Binary files /dev/null and b/resolve_proxy_encoder/__pycache__/start_workers.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/app/__pycache__/__init__.cpython-310.pyc b/resolve_proxy_encoder/app/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..5de9f2d Binary files /dev/null and b/resolve_proxy_encoder/app/__pycache__/__init__.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/app/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..ab7a8dd Binary files /dev/null and b/resolve_proxy_encoder/app/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/app/__pycache__/checks.cpython-310.pyc b/resolve_proxy_encoder/app/__pycache__/checks.cpython-310.pyc new file mode 100644 index 0000000..de663af Binary files /dev/null and b/resolve_proxy_encoder/app/__pycache__/checks.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/__pycache__/checks.cpython-36.pyc b/resolve_proxy_encoder/app/__pycache__/checks.cpython-36.pyc new file mode 100644 index 0000000..95ffd06 Binary files /dev/null and b/resolve_proxy_encoder/app/__pycache__/checks.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/app/__pycache__/cli.cpython-310.pyc b/resolve_proxy_encoder/app/__pycache__/cli.cpython-310.pyc new file mode 100644 index 0000000..2099c95 Binary files /dev/null and b/resolve_proxy_encoder/app/__pycache__/cli.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/__pycache__/cli.cpython-36.pyc b/resolve_proxy_encoder/app/__pycache__/cli.cpython-36.pyc new file mode 100644 index 0000000..d8e3b4d Binary files /dev/null and b/resolve_proxy_encoder/app/__pycache__/cli.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/__init__.cpython-310.pyc b/resolve_proxy_encoder/app/utils/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..1923da7 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/__init__.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/app/utils/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..96f45b3 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/core.cpython-310.pyc b/resolve_proxy_encoder/app/utils/__pycache__/core.cpython-310.pyc new file mode 100644 index 0000000..a4aec65 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/core.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/core.cpython-36.pyc b/resolve_proxy_encoder/app/utils/__pycache__/core.cpython-36.pyc new file mode 100644 index 0000000..71be344 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/core.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/paths.cpython-310.pyc b/resolve_proxy_encoder/app/utils/__pycache__/paths.cpython-310.pyc new file mode 100644 index 0000000..d776554 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/paths.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/pkg_info.cpython-310.pyc b/resolve_proxy_encoder/app/utils/__pycache__/pkg_info.cpython-310.pyc new file mode 100644 index 0000000..ad372c4 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/pkg_info.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/app/utils/__pycache__/pkg_info.cpython-36.pyc b/resolve_proxy_encoder/app/utils/__pycache__/pkg_info.cpython-36.pyc new file mode 100644 index 0000000..b069189 Binary files /dev/null and b/resolve_proxy_encoder/app/utils/__pycache__/pkg_info.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/queuer/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..5907e9e Binary files /dev/null and b/resolve_proxy_encoder/queuer/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/__pycache__/chunking.cpython-36.pyc b/resolve_proxy_encoder/queuer/__pycache__/chunking.cpython-36.pyc new file mode 100644 index 0000000..47dce7e Binary files /dev/null and b/resolve_proxy_encoder/queuer/__pycache__/chunking.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/__pycache__/handlers.cpython-36.pyc b/resolve_proxy_encoder/queuer/__pycache__/handlers.cpython-36.pyc new file mode 100644 index 0000000..8b63faa Binary files /dev/null and b/resolve_proxy_encoder/queuer/__pycache__/handlers.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/__pycache__/link.cpython-36.pyc b/resolve_proxy_encoder/queuer/__pycache__/link.cpython-36.pyc new file mode 100644 index 0000000..a5be63e Binary files /dev/null and b/resolve_proxy_encoder/queuer/__pycache__/link.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/__pycache__/queue.cpython-36.pyc b/resolve_proxy_encoder/queuer/__pycache__/queue.cpython-36.pyc new file mode 100644 index 0000000..2de5fa7 Binary files /dev/null and b/resolve_proxy_encoder/queuer/__pycache__/queue.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/__pycache__/resolve.cpython-36.pyc b/resolve_proxy_encoder/queuer/__pycache__/resolve.cpython-36.pyc new file mode 100644 index 0000000..65a55b6 Binary files /dev/null and b/resolve_proxy_encoder/queuer/__pycache__/resolve.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/queuer/handlers.py b/resolve_proxy_encoder/queuer/handlers.py index bc6bc48..a010e2c 100644 --- a/resolve_proxy_encoder/queuer/handlers.py +++ b/resolve_proxy_encoder/queuer/handlers.py @@ -3,8 +3,6 @@ import os import pathlib import shutil -import sys -from tkinter import E from typing import Union from rich import print as pprint @@ -119,7 +117,7 @@ def handle_orphaned_proxies(media_list: list) -> list: orphaned_proxies = [] for media in media_list: - if media["proxy"] != "None" or media["proxy"] == "Offline": + if media["proxy_status"] != "None" or media["proxy_status"] == "Offline": linked_proxy_path = os.path.splitext(media["proxy_media_path"]) linked_proxy_path[1].lower() @@ -196,7 +194,9 @@ def handle_already_linked( """ logger.info(f"[cyan]Checking for source media with linked proxies.[/]") - already_linked = [x for x in media_list if str(x["proxy"]) not in unlinked_types] + already_linked = [ + x for x in media_list if str(x["proxy_status"]) not in unlinked_types + ] if len(already_linked) > 0: @@ -267,15 +267,13 @@ def get_newest_proxy_file(media, expected_proxy_path: str) -> Union[str, None]: # Iterate media list for media in media_list: - if media["proxy"] in unlinked_types: + if media["proxy_status"] in unlinked_types: - expected_proxy_dir = media["expected_proxy_dir"] - logger.debug( - f"[magenta]Expected proxy directory:[/] '{expected_proxy_dir}'" - ) + proxy_dir = media["proxy_dir"] + logger.debug(f"[magenta]Expected proxy directory:[/] '{proxy_dir}'") # Get expected proxy path - glob_partial_match = os.path.join(expected_proxy_dir, media["file_name"]) + glob_partial_match = os.path.join(proxy_dir, media["file_name"]) # Get expected path partial match for globbing glob_partial_match = os.path.splitext(glob_partial_match)[0] @@ -289,7 +287,7 @@ def get_newest_proxy_file(media, expected_proxy_path: str) -> Union[str, None]: logger.debug( f"[green bold]Matched existing proxy: '{existing_proxy_file}'\n" ) - media.update({"unlinked_proxy": existing_proxy_file}) + media.update({"proxy_media_path": existing_proxy_file}) existing_unlinked.append(existing_proxy_file) # If any unlinked, prompt for linking @@ -307,7 +305,9 @@ def get_newest_proxy_file(media, expected_proxy_path: str) -> Union[str, None]: "[/bold]Would you like to link them? If not they will be re-rendered." ): - return link.link_proxies_with_mpi(media_list) + return link.link_proxies_with_mpi( + media_list, linkable_types=["Offline", "None"] + ) else: @@ -332,7 +332,7 @@ def handle_offline_proxies(media_list: list) -> list: """ logger.info(f"[cyan]Checking for offline proxies[/]") - offline_proxies = [x for x in media_list if x["proxy"] == "Offline"] + offline_proxies = [x for x in media_list if x["proxy_status"] == "Offline"] if len(offline_proxies) > 0: @@ -351,7 +351,7 @@ def handle_offline_proxies(media_list: list) -> list: for x in media_list: if x["file_path"] == offline_proxy["file_path"]: - x["proxy"] = "None" + x["proxy_status"] = "None" elif answer.lower().startswith("a"): @@ -361,7 +361,7 @@ def handle_offline_proxies(media_list: list) -> list: for x in media_list: if x == "Offline": - x["proxy"] = "None" + x["proxy_status"] = "None" global SOME_ACTION_TAKEN SOME_ACTION_TAKEN = True diff --git a/resolve_proxy_encoder/queuer/link.py b/resolve_proxy_encoder/queuer/link.py index 2e2aeaf..59f3e7c 100644 --- a/resolve_proxy_encoder/queuer/link.py +++ b/resolve_proxy_encoder/queuer/link.py @@ -222,7 +222,7 @@ def find_and_link_proxies(project, proxy_files) -> Tuple[list, list]: return linked, failed -def link_proxies_with_mpi(media_list): +def link_proxies_with_mpi(media_list, linkable_types: list = ["Offline", "None"]): """Iterate through media mutated during script call, attempt to link the source media. Return all that are not succesfully linked.""" @@ -234,23 +234,26 @@ def link_proxies_with_mpi(media_list): # Iterate through all available proxies for media in media_list: - proxy = media.get("unlinked_proxy", None) + proxy_media_path = media.get("proxy_media_path", None) + proxy_status = media.get("proxy_status") - if not proxy: + if proxy_status not in linkable_types: continue - if not os.path.exists(proxy): - logger.error(f"[red]Proxy media not found at '{proxy}'") - - else: - # Set existing to none once linked - media.update({"unlinked_proxy": None}) + if not os.path.exists(proxy_media_path): + logger.error(f"[red]Proxy media not found at '{proxy_media_path}'") + media.update({"proxy_media_path": None}) # TODO: Should probably use MediaInfo here instead of hardcode - media.update({"Proxy": "1280x720"}) + + # We only define the vertical res in `user_settings` so we can preserve aspect ratio. + # To get the proper resolution, we'd have to get the original file resolution. + # labels: enhancement + + media.update({"proxy_status": "1280x720"}) # Actually link proxies - if media["media_pool_item"].LinkProxyMedia(proxy): + if media["media_pool_item"].LinkProxyMedia(proxy_media_path): # TODO get this working! logger.info(f"[green bold]Linked [/]'{media['clip_name']}'") @@ -278,7 +281,7 @@ def link_proxies_with_mpi(media_list): # Remove offline status, redefine media list for x in media_list: if x in link_fail: - x["proxy"] = "None" + x["proxy_status"] = "None" media_list = [x for x in media_list if x not in link_success] diff --git a/resolve_proxy_encoder/queuer/queue.py b/resolve_proxy_encoder/queuer/queue.py index 07e4b53..e97f51f 100644 --- a/resolve_proxy_encoder/queuer/queue.py +++ b/resolve_proxy_encoder/queuer/queue.py @@ -136,7 +136,7 @@ def main(): logger.info("[cyan]Linking proxies") try: - proxies = [x["unlinked_proxy"] for x in jobs] + proxies = [x["proxy_media_path"] for x in jobs] link.find_and_link_proxies(r_.project, proxies) core.app_exit(0) diff --git a/resolve_proxy_encoder/queuer/resolve.py b/resolve_proxy_encoder/queuer/resolve.py index 2a4f963..6de3d0a 100644 --- a/resolve_proxy_encoder/queuer/resolve.py +++ b/resolve_proxy_encoder/queuer/resolve.py @@ -271,7 +271,7 @@ def get_resolve_proxy_jobs(media_pool_items): file_path = clip_properties["File Path"] p = pathlib.Path(file_path) - expected_proxy_dir = os.path.normpath( + proxy_dir = os.path.normpath( os.path.join( settings["paths"]["proxy_path_root"], os.path.dirname(p.relative_to(*p.parts[:1])), @@ -291,11 +291,11 @@ def get_resolve_proxy_jobs(media_pool_items): "fps": float(cp["FPS"]), "h_flip": True if cp["H-FLIP"] == "On" else False, "v_flip": True if cp["H-FLIP"] == "On" else False, - "proxy": cp["Proxy"], + "proxy_status": cp["Proxy"], "proxy_media_path": cp["Proxy Media Path"] if not len(cp["Proxy Media Path"]) else cp["Proxy Media Path"], - "expected_proxy_dir": expected_proxy_dir, + "proxy_dir": proxy_dir, "start": int(cp["Start"]), "end": int(cp["End"]), "start_tc": cp["Start TC"], diff --git a/resolve_proxy_encoder/settings/__pycache__/__init__.cpython-310.pyc b/resolve_proxy_encoder/settings/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..0ac7c2e Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/__init__.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/settings/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..3859792 Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/app_settings.cpython-310.pyc b/resolve_proxy_encoder/settings/__pycache__/app_settings.cpython-310.pyc new file mode 100644 index 0000000..be50964 Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/app_settings.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/app_settings.cpython-36.pyc b/resolve_proxy_encoder/settings/__pycache__/app_settings.cpython-36.pyc new file mode 100644 index 0000000..8b12ca1 Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/app_settings.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/manager.cpython-310.pyc b/resolve_proxy_encoder/settings/__pycache__/manager.cpython-310.pyc new file mode 100644 index 0000000..cef1e49 Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/manager.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/manager.cpython-36.pyc b/resolve_proxy_encoder/settings/__pycache__/manager.cpython-36.pyc new file mode 100644 index 0000000..eb6f956 Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/manager.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/schema.cpython-310.pyc b/resolve_proxy_encoder/settings/__pycache__/schema.cpython-310.pyc new file mode 100644 index 0000000..06dc4be Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/schema.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/settings/__pycache__/schema.cpython-36.pyc b/resolve_proxy_encoder/settings/__pycache__/schema.cpython-36.pyc new file mode 100644 index 0000000..67f097b Binary files /dev/null and b/resolve_proxy_encoder/settings/__pycache__/schema.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/settings/manager.py b/resolve_proxy_encoder/settings/manager.py index 31b8893..05d6fda 100644 --- a/resolve_proxy_encoder/settings/manager.py +++ b/resolve_proxy_encoder/settings/manager.py @@ -91,7 +91,12 @@ def __getitem__(self, __items): if type(__items) == str: __items = __items.split(" ") - return reduce(operator.getitem, __items, self.user_settings) + try: + return reduce(operator.getitem, __items, self.user_settings) + + except KeyError as e: + + raise KeyError(e) def _load_default_file(self): """Load default settings from yaml""" diff --git a/resolve_proxy_encoder/worker/__pycache__/__init__.cpython-310.pyc b/resolve_proxy_encoder/worker/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000..7c33dd8 Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/__init__.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/worker/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/worker/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..42e1002 Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/__pycache__/celery.cpython-310.pyc b/resolve_proxy_encoder/worker/__pycache__/celery.cpython-310.pyc new file mode 100644 index 0000000..0d85cb7 Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/celery.cpython-310.pyc differ diff --git a/resolve_proxy_encoder/worker/__pycache__/celery.cpython-36.pyc b/resolve_proxy_encoder/worker/__pycache__/celery.cpython-36.pyc new file mode 100644 index 0000000..e429500 Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/celery.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/__pycache__/helpers.cpython-36.pyc b/resolve_proxy_encoder/worker/__pycache__/helpers.cpython-36.pyc new file mode 100644 index 0000000..12f56a5 Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/helpers.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/__pycache__/launch_workers.cpython-36.pyc b/resolve_proxy_encoder/worker/__pycache__/launch_workers.cpython-36.pyc new file mode 100644 index 0000000..46bde73 Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/launch_workers.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/__pycache__/utils.cpython-36.pyc b/resolve_proxy_encoder/worker/__pycache__/utils.cpython-36.pyc new file mode 100644 index 0000000..d9564ee Binary files /dev/null and b/resolve_proxy_encoder/worker/__pycache__/utils.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/ffmpeg/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/worker/ffmpeg/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..ba426df Binary files /dev/null and b/resolve_proxy_encoder/worker/ffmpeg/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/ffmpeg/__pycache__/ffmpeg_process.cpython-36.pyc b/resolve_proxy_encoder/worker/ffmpeg/__pycache__/ffmpeg_process.cpython-36.pyc new file mode 100644 index 0000000..63deb98 Binary files /dev/null and b/resolve_proxy_encoder/worker/ffmpeg/__pycache__/ffmpeg_process.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/ffmpeg/__pycache__/utils.cpython-36.pyc b/resolve_proxy_encoder/worker/ffmpeg/__pycache__/utils.cpython-36.pyc new file mode 100644 index 0000000..99898ab Binary files /dev/null and b/resolve_proxy_encoder/worker/ffmpeg/__pycache__/utils.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/tasks/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/worker/tasks/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..7121358 Binary files /dev/null and b/resolve_proxy_encoder/worker/tasks/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/tasks/encode/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/worker/tasks/encode/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..c0421de Binary files /dev/null and b/resolve_proxy_encoder/worker/tasks/encode/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/tasks/encode/__pycache__/tasks.cpython-36.pyc b/resolve_proxy_encoder/worker/tasks/encode/__pycache__/tasks.cpython-36.pyc new file mode 100644 index 0000000..0d01a49 Binary files /dev/null and b/resolve_proxy_encoder/worker/tasks/encode/__pycache__/tasks.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/tasks/encode/tasks.py b/resolve_proxy_encoder/worker/tasks/encode/tasks.py index 55fccf9..60b0005 100644 --- a/resolve_proxy_encoder/worker/tasks/encode/tasks.py +++ b/resolve_proxy_encoder/worker/tasks/encode/tasks.py @@ -53,15 +53,15 @@ def encode_proxy(self, job): # TODO: Integrate cross-platform path mapping. Move `check_wsl` func. # Convert paths for WSL if check_wsl(): - job["expected_proxy_dir"].update(get_wsl_path(job["expected_proxy_dir"])) + job["proxy_dir"].update(get_wsl_path(job["proxy_dir"])) # Create proxy dir - logger.debug(f"Output Dir: '{job['expected_proxy_dir']}'") + logger.debug(f"Output Dir: '{job['proxy_dir']}'") try: os.makedirs( - job["expected_proxy_dir"], + job["proxy_dir"], exist_ok=True, ) @@ -70,7 +70,7 @@ def encode_proxy(self, job): raise e output_file = os.path.join( - job["expected_proxy_dir"], + job["proxy_dir"], os.path.splitext(job["file_name"])[0] + proxy_settings["ext"], ) logger.info(f"Output File: '{output_file}'\n") diff --git a/resolve_proxy_encoder/worker/tasks/standard/__pycache__/__init__.cpython-36.pyc b/resolve_proxy_encoder/worker/tasks/standard/__pycache__/__init__.cpython-36.pyc new file mode 100644 index 0000000..73cb4a6 Binary files /dev/null and b/resolve_proxy_encoder/worker/tasks/standard/__pycache__/__init__.cpython-36.pyc differ diff --git a/resolve_proxy_encoder/worker/tasks/standard/__pycache__/tasks.cpython-36.pyc b/resolve_proxy_encoder/worker/tasks/standard/__pycache__/tasks.cpython-36.pyc new file mode 100644 index 0000000..eb6c0af Binary files /dev/null and b/resolve_proxy_encoder/worker/tasks/standard/__pycache__/tasks.cpython-36.pyc differ