From 3eebf3410695fa4027f64f381700cd5253448904 Mon Sep 17 00:00:00 2001 From: itdominator <1itdominator@gmail.com> Date: Mon, 6 Dec 2021 21:59:52 -0600 Subject: [PATCH] Fixing folder move/rename --- .../new/solarfm/shellfm/windows/view/utils/FileHandler.py | 2 +- .../solarfm/signal_classes/mixins/WidgetFileActionMixin.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/FileHandler.py b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/FileHandler.py index 57c69e3..5a23aeb 100644 --- a/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/FileHandler.py +++ b/src/versions/solarfm-0.0.1/SolarFM/new/solarfm/shellfm/windows/view/utils/FileHandler.py @@ -51,7 +51,7 @@ class FileHandler: def move_file(self, fFile, tFile): try: print(f"Moving: {fFile} --> {tFile}") - if os.path.exists(fFile) and os.path.exists(tFile): + if os.path.exists(fFile) and not os.path.exists(tFile): if not tFile.endswith("/"): tFile += "/" 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 647f41a..497faf7 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 @@ -287,14 +287,12 @@ class WidgetFileActionMixin: wid, tid = self.window_controller.get_active_data() view = self.get_fm_window(wid).get_view_by_id(tid) fPath = file.get_path() - tPath = None + tPath = target.get_path() state = True if action == "copy": - tPath = target.get_path() view.copy_file(fPath, tPath) if action == "move" or action == "rename": - tPath = target.get_parent().get_path() view.move_file(fPath, tPath) else: if action == "copy":