From f82541b37a0aad86b44f475fdf9f689206521e81 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Mon, 27 Mar 2023 20:54:52 -0500 Subject: [PATCH] Big fixes --- .../signals/file_action_signals_mixin.py | 21 +++++++++---------- .../core/widgets/bottom_status_info_widget.py | 6 +++++- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/file_action_signals_mixin.py b/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/file_action_signals_mixin.py index 1964054..1a6fd73 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/file_action_signals_mixin.py +++ b/src/versions/solarfm-0.0.1/solarfm/core/mixins/signals/file_action_signals_mixin.py @@ -36,18 +36,17 @@ class FileActionSignalsMixin: # NOTE: Too lazy to impliment a proper update handler and so just regen store and update tab. # Use a lock system to prevent too many update calls for certain instances but user can manually refresh if they have urgency def dir_watch_updates(self, file_monitor, file, other_file=None, eve_type=None, data=None): - if eve_type == Gio.FileMonitorEvent.CHANGES_DONE_HINT: - if eve_type in [Gio.FileMonitorEvent.CREATED, Gio.FileMonitorEvent.DELETED, - Gio.FileMonitorEvent.RENAMED, Gio.FileMonitorEvent.MOVED_IN, - Gio.FileMonitorEvent.MOVED_OUT]: - logger.debug(eve_type) + if eve_type in [Gio.FileMonitorEvent.CREATED, Gio.FileMonitorEvent.DELETED, + Gio.FileMonitorEvent.RENAMED, Gio.FileMonitorEvent.MOVED_IN, + Gio.FileMonitorEvent.MOVED_OUT]: + logger.debug(eve_type) - if eve_type in [Gio.FileMonitorEvent.MOVED_IN, Gio.FileMonitorEvent.MOVED_OUT]: - self.update_on_soft_lock_end(data[0]) - elif data[0] in self.soft_update_lock.keys(): - self.soft_update_lock[data[0]]["last_update_time"] = time.time() - else: - self.soft_lock_countdown(data[0]) + if eve_type in [Gio.FileMonitorEvent.MOVED_IN, Gio.FileMonitorEvent.MOVED_OUT]: + self.update_on_soft_lock_end(data[0]) + elif data[0] in self.soft_update_lock.keys(): + self.soft_update_lock[data[0]]["last_update_time"] = time.time() + else: + self.soft_lock_countdown(data[0]) @threaded def soft_lock_countdown(self, tab_widget): diff --git a/src/versions/solarfm-0.0.1/solarfm/core/widgets/bottom_status_info_widget.py b/src/versions/solarfm-0.0.1/solarfm/core/widgets/bottom_status_info_widget.py index ad50f47..4754861 100644 --- a/src/versions/solarfm-0.0.1/solarfm/core/widgets/bottom_status_info_widget.py +++ b/src/versions/solarfm-0.0.1/solarfm/core/widgets/bottom_status_info_widget.py @@ -10,6 +10,10 @@ from gi.repository import Gio +class BottomStatusInfoException(Exception): + ... + + class BottomStatusInfoWidget: """docstring for BottomStatusInfoWidget.""" @@ -80,7 +84,7 @@ class BottomStatusInfoWidget: cancellable=None) file_size = file_info.get_size() combined_size += file_size - except WindowException as e: + except BottomStatusInfoException as e: logger.debug(repr(e)) formatted_size = sizeof_fmt(combined_size)