Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

DRY

Browse Source
This commit is contained in:
un-pogaz 2025-01-17 20:09:33 +01:00
parent ee21e84110
commit a503f07bfd
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/calibre/gui2/tag_browser/model.py
View File

@ -424,10 +424,10 @@ class TagsModel(QAbstractItemModel): # {{{
''' '''
old_icon = self.prefs['tags_browser_category_icons'].get(old_key, None) old_icon = self.prefs['tags_browser_category_icons'].get(old_key, None)
if old_icon is not None: if old_icon is not None:
old_path = os.path.join(config_dir, 'tb_icons', old_icon) old_path = os.path.join(self.icon_config_dir, old_icon)
_, ext = os.path.splitext(old_path) _, ext = os.path.splitext(old_path)
new_icon = new_key + ext new_icon = new_key + ext
new_path = os.path.join(config_dir, 'tb_icons', new_icon) new_path = os.path.join(self.icon_config_dir, new_icon)
os.replace(old_path, new_path) os.replace(old_path, new_path)
self.set_custom_category_icon(new_key, new_icon) self.set_custom_category_icon(new_key, new_icon)
self.set_custom_category_icon(old_key, None) self.set_custom_category_icon(old_key, None)
@ -456,31 +456,27 @@ class TagsModel(QAbstractItemModel): # {{{
self.value_icon_cache.pop(file_name, None) self.value_icon_cache.pop(file_name, None)
self.prefs['tags_browser_value_icons'] = self.value_icons self.prefs['tags_browser_value_icons'] = self.value_icons
def remove_value_icon(self, key, value, file_name): def _remove_icon_file(self, file_name):
self.value_icons = self.prefs['tags_browser_value_icons']
self.value_icons.get(key, {}).pop(value, None)
self.prefs['tags_browser_value_icons'] =self.value_icons
if file_name is not None: if file_name is not None:
path = os.path.join(config_dir, 'tb_icons', file_name) path = os.path.join(self.icon_config_dir, file_name)
try: try:
os.remove(path) os.remove(path)
except: except:
pass pass
def remove_value_icon(self, key, value, file_name):
self.value_icons = self.prefs['tags_browser_value_icons']
self.value_icons.get(key, {}).pop(value, None)
self.prefs['tags_browser_value_icons'] =self.value_icons
self._remove_icon_file(file_name)
def set_custom_category_icon(self, key, path): def set_custom_category_icon(self, key, path):
d = self.prefs['tags_browser_category_icons'] d = self.prefs['tags_browser_category_icons']
if path: if path:
d[key] = path d[key] = path
self.category_custom_icons[key] = QIcon(os.path.join(config_dir, self.category_custom_icons[key] = QIcon(os.path.join(self.icon_config_dir, path))
'tb_icons', path))
else: else:
if key in d: self._remove_icon_file(d.pop(key, None))
path = os.path.join(config_dir, 'tb_icons', d[key])
try:
os.remove(path)
except:
pass
d.pop(key, None)
self.category_custom_icons.pop(key, None) self.category_custom_icons.pop(key, None)
self.prefs['tags_browser_category_icons'] = d self.prefs['tags_browser_category_icons'] = d