From dec28e31cf6010e537b094fc2cb3941e1a55f3e8 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Sat, 25 Dec 2021 03:20:39 -0600 Subject: [PATCH] Logic and bug fix from last commit --- .../signal_classes/mixins/WidgetFileActionMixin.py | 2 +- .../new/solarfm/signal_classes/mixins/WindowMixin.py | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py index 87babef..3c92ae6 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WidgetFileActionMixin.py @@ -34,7 +34,7 @@ class WidgetFileActionMixin: watcher = None return - dir_watcher = Gio.File.new_for_path(cur_dir) + dir_watcher = Gio.File.new_for_path(cur_dir) \ .monitor_directory(Gio.FileMonitorFlags.WATCH_MOVES, Gio.Cancellable()) wid = view.get_wid() diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py index 02369f4..1068ed2 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py +++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/signal_classes/mixins/WindowMixin.py @@ -179,10 +179,14 @@ class WindowMixin(TabMixin): fileName = store[item][1] dir = view.get_current_directory() - file = f"{dir}/{fileName}" + file = "" + if fileName.endswith("/"): + file = f"{dir}/{fileName}" + else: + file = f"{dir}/{fileName}/" - if isdir(f"{file}/"): - view.set_path(f"{file}/") + if isdir(file): + view.set_path(file) self.update_view(tab_label, view, store, wid, tid) else: self.open_files()