From 58de08aed0ca241099a7fa702b2f5f8306b87b2d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 1 Sep 2023 09:21:26 +0530 Subject: [PATCH] MTP driver: Ignore folders whose names end with .sdr on Kindle devices --- src/calibre/devices/mtp/defaults.py | 2 +- src/calibre/devices/mtp/driver.py | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/calibre/devices/mtp/defaults.py b/src/calibre/devices/mtp/defaults.py index b8d091a347..3c4fd00369 100644 --- a/src/calibre/devices/mtp/defaults.py +++ b/src/calibre/devices/mtp/defaults.py @@ -68,4 +68,4 @@ class DeviceDefaults: ans['calibre_file_paths'] = {'metadata':'NOOK/metadata.calibre', 'driveinfo':'NOOK/driveinfo.calibre'} return ans - return {} + return {}, vid, pid diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py index 266e1cf50c..a92b168b49 100644 --- a/src/calibre/devices/mtp/driver.py +++ b/src/calibre/devices/mtp/driver.py @@ -56,6 +56,7 @@ class MTP_DEVICE(BASE): self._prefs = None self.device_defaults = DeviceDefaults() self.current_device_defaults = {} + self.current_vid = self.current_pid = -1 self.calibre_file_paths = {'metadata':self.METADATA_CACHE, 'driveinfo':self.DRIVEINFO} self.highlight_ignored_folders = False @@ -88,6 +89,8 @@ class MTP_DEVICE(BASE): if storage_id in ignored_folders: # Use the users ignored folders settings return '/'.join(lpath) in {icu_lower(x) for x in ignored_folders[storage_id]} + if self.current_vid == 0x1949 and lpath and lpath[-1].endswith('.sdr'): + return True # Implement the default ignore policy @@ -136,7 +139,7 @@ class MTP_DEVICE(BASE): isoformat(utcnow())) self.prefs['history'] = h - self.current_device_defaults = self.device_defaults(device, self) + self.current_device_defaults, self.current_vid, self.current_pid = self.device_defaults(device, self) self.calibre_file_paths = self.current_device_defaults.get( 'calibre_file_paths', {'metadata':self.METADATA_CACHE, 'driveinfo':self.DRIVEINFO})