From 01b4610956abd28a68486a1b29108ebe5f75de19 Mon Sep 17 00:00:00 2001 From: Andrew Senetar Date: Wed, 25 Aug 2021 21:40:58 -0500 Subject: [PATCH] Update to work with latest changes in dupeguru --- build.py | 2 +- cocoa/inter/app.py | 2 +- cocoalib/cocoa/inter.py | 2 +- dupeguru | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build.py b/build.py index 913ddbc..9dd9c38 100644 --- a/build.py +++ b/build.py @@ -90,7 +90,7 @@ def build_cocoa(dev): os.mkdir(pydep_folder) shutil.copy(op.join(cocoa_project_path, 'dg_cocoa.py'), 'build') tocopy = [ - 'dupeguru/core', 'dupeguru/hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'hsaudiotag', + 'dupeguru/core', 'dupeguru/hscommon', 'cocoa/inter', 'cocoalib/cocoa', 'objp', 'send2trash', 'mutagen' ] copy_packages(tocopy, pydep_folder, create_links=dev) sys.path.insert(0, 'build') diff --git a/cocoa/inter/app.py b/cocoa/inter/app.py index 6bc3e4e..f2dfa02 100644 --- a/cocoa/inter/app.py +++ b/cocoa/inter/app.py @@ -31,7 +31,7 @@ class DupeGuru(DupeGuruBase): def _get_fileclasses(self): result = DupeGuruBase._get_fileclasses(self) - if self.app_mode == AppMode.Standard: + if self.app_mode == AppMode.STANDARD: result = [Bundle] + result return result diff --git a/cocoalib/cocoa/inter.py b/cocoalib/cocoa/inter.py index 01d7e77..a48c68a 100644 --- a/cocoalib/cocoa/inter.py +++ b/cocoalib/cocoa/inter.py @@ -181,7 +181,7 @@ class PyTable(PyGUIObject): #--- Cocoa --> Python def columns(self) -> pyref: - return self.model.columns + return self.model._columns def add(self): self.model.add() diff --git a/dupeguru b/dupeguru index bf7d720..47dbe80 160000 --- a/dupeguru +++ b/dupeguru @@ -1 +1 @@ -Subproject commit bf7d720126525557d45d4293076553372cc78d34 +Subproject commit 47dbe805bb563f3f4ffb90730fc8b1349448789e