refactor: Remove commit logic

in03 · Dec 2, 2022 · 7e83b8e · 7e83b8e
1 parent d388d3c
commit 7e83b8e
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 127 deletions.
diff --git a/src/dpg.ini b/src/dpg.ini
@@ -63,3 +63,8 @@ Pos=163,200
 Size=458,100
 Collapsed=0
 
+[Window][###85]
+Pos=184,195
+Size=416,110
+Collapsed=0
+
diff --git a/src/patchwork/app.py b/src/patchwork/app.py
@@ -369,10 +369,8 @@ def clear_markers():
 
 # Commands
 def add_change():
-
 
     global refresh_now
-
     create_marker()
 
     print("Fresh")
@@ -387,38 +385,8 @@ def clear_changes():
         return
 
     refresh_now = True
-
-def commit_changes():
-
-    timeline = resolve.active_timeline
-    framerate = timeline.settings.frame_rate
-    min_duration = int(framerate) * 2
-    markers = timeline.markers.find_all("patchwork_marker")
-
-    patchfile = PatchFile(track_patch_file.chosen_filepath)
-    saved_settings = patchfile.load()
-    print(saved_settings)
-    # compare_settings = patchfile.compare()
-
-    assert markers
-
-    invalid_markers = [x for x in markers if x.duration < min_duration]
-    if invalid_markers:
-        dialog_box.prompt(
-            "Markers shouldn't be shorter than 2 seconds.\n"
-            f"These markers are invalid:\n{invalid_markers}",
-        )
-        return
-
-    # TODO: Check for overlapping markers
-
-    for x in markers:
-        x.color = "Green"
-
-    patchfile.update(markers)
-
-
-def push_changes():
+
+def render_changes():
 
     project = resolve.project
     timeline = resolve.active_timeline
@@ -547,42 +515,27 @@ def setup_gui():
                     dpg.add_text("Mark changes on the active timeline to patch the master file with", wrap=500)
                     dpg.add_spacer(height=20) 
 
-
                     with dpg.group(tag="add_group", horizontal=True):
 
                         # ADD BUTTON
                         dpg.add_button(label="Add", tag="add_button", callback=add_change)
 
                         # CLEAR BUTTON
-                        dpg.add_button(label="hanges", tag="clear_changes_button", callback=clear_changes)
-                        with dpg.tooltip("clear_changes_button"):
-                            dpg.add_text("Clear all of Patchwork's ranged-markers\nfrom the active timeline")
+                        dpg.add_button(label="Clear All", tag="clear_changes_button", callback=clear_changes)
 
                     dpg.add_text("N/A", tag="current_timecode_display", color=[255, 150, 0])
 
-                    dpg.add_separator()
-                    dpg.add_spacer(height=20)
-
-                    # COMMIT BUTTON
-                    dpg.add_text("Commit changes and create render jobs", wrap=500)
-                    with dpg.group(tag="commit_group"):
-                        dpg.add_text("No changes to commit", tag="commit_status", color=[255, 100, 100], wrap=500)
-                        dpg.add_button(label="Commit", tag="commit_button", callback=commit_changes)
-
                     dpg.add_separator()
                     dpg.add_spacer(height=20) 
 
-                    # PUSH BUTTON
-                    dpg.add_button(label="Push", tag="push_button", callback=push_changes)
-                    with dpg.tooltip("push_button"):
+                    # RENDER BUTTON
+                    dpg.add_button(label="Render", tag="render_button", callback=render_changes)
+                    with dpg.tooltip("render_button"):
                         dpg.add_text("Render and merge changes")
 
                     dpg.add_separator()
                     dpg.add_spacer(height=20) 
 
-
-                    dpg.add_spacer(height=20) 
-
                 # SOURCE PAGE
                 with dpg.tab(label="Source"):
 
@@ -674,24 +627,7 @@ async def render():
             logger.debug("[magenta]Running complex routines")
             await routines.check_timecode_starts_at_zero(current_frame_rate, current_timecode)
             await routines.refresh_add_status(current_markers, current_timecode, current_frame)
-            await routines.refresh_commit_status(current_markers)
-
-            # TODO: Check Resolve is open, lock up whole interface with warning otherwise
-            # No option to dismiss dialog box. Automatically dismiss box when Resolve is opened
 
-            # TODO: Check timeline is open, lock up whole interface with warning otherwise
-            # No option to dismiss dialog box. Automatically dismiss box when timeline is opened
-
-            # TODO: Check timeline is same as tracked timeline, disable changes page
-            # On each timeline change, ensure custom settings are enabled. Make it so.
-
-            # RUN EVERY HALF SECOND REGARDLESS OF ENVIRONMENT STATE
-            current_timecode = copy.copy(resolve.active_timeline.timecode)
-
-            logger.debug("[magenta]Running complex routines")
-            await routines.refresh_add_status(markers, current_timecode, current_frame)
-            await routines.refresh_commit_status(markers)
-
     await trio.sleep(0)
 
 async def main():

diff --git a/src/patchwork/routines.py b/src/patchwork/routines.py
@@ -6,7 +6,6 @@
 from widgets import dialog_box
 import trio
 import logging
-import copy
 
 logger = logging.getLogger(__name__)
 logger.setLevel(dpg.get_value("loglevel"))
@@ -183,59 +182,4 @@ async def check_timecode_starts_at_zero(current_frame_rate:float, current_timeco
             )
             dpg.set_value("zero_timecode_warning_dismissed", True)
 
-    await trio.sleep(0)
-
-async def refresh_commit_status(current_markers:MarkerCollection):
-
-    logger.debug("[magenta]Refreshing 'Commit' status")
-
-    committed_changes = []
-    uncommitted_changes = []
-    invalid_changes = []
-
-    for x in current_markers:
-        if x.customdata != "patchwork_marker":
-            continue
-        if x.color == "Green":
-            committed_changes.append(x)
-        elif x.color == "Purple":
-            uncommitted_changes.append(x)
-        else:
-            invalid_changes.append(x)
-
-    assert not invalid_changes 
-
-    if committed_changes and not uncommitted_changes:
-        dpg.configure_item("commit_status", color=[0, 255, 0]) 
-        dpg.set_value("commit_status", f"All changes committed")
-        dpg.configure_item("push_button", enabled=True)
-
-    elif uncommitted_changes and not committed_changes:
-        dpg.configure_item("commit_status", color=[255, 150, 0])
-        dpg.configure_item("commit_button", enabled=True)
-        dpg.configure_item("push_button", enabled=False)
-        dpg.set_value("commit_status", f"{len(uncommitted_changes)} uncommitted")
-
-    elif uncommitted_changes:
-        dpg.configure_item("commit_button", enabled=True)
-        dpg.configure_item("push_button", enabled=False)
-        dpg.configure_item("commit_status", color=[255, 150, 0]) 
-        dpg.set_value(
-            "commit_status", 
-            f"{len(uncommitted_changes)} uncommitted | "
-            f"{len(committed_changes)} committed"
-        )
-
-    elif not committed_changes and not uncommitted_changes:
-        dpg.configure_item("commit_button", enabled=False)
-        dpg.configure_item("push_button", enabled=False)
-        dpg.configure_item("commit_status", color=[50, 150, 255])
-        dpg.set_value("commit_status", "No changes")
-
-    else:
-        dpg.configure_item("commit_button", enabled=False)
-        dpg.configure_item("push_button", enabled=False)
-        dpg.configure_item("commit_status", color=[255, 150, 0])
-        dpg.set_value("commit_status", "N/A")
-
-    await trio.sleep(0)
+    await trio.sleep(0)