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

Open With: don't raise KeyError if cache exists and there are new dirs

Browse Source 
If the cache failed to load, it is initialized as a defaultdict and all
mtimes compare as 0. If the cache did load, however, then an ordinary
dict was used, and if new icon directories appeared on the system since
the cache creation, they would raise a KeyError and Open With would not
load data.

Fix by using a defaultdict in all cases, but initializing with the
contents of the cache if possible.

Discovered when crazy applications added crazy subdirectories in
/usr/share/pixmaps (???) and suddenly calibre failed to do the right
thing, but the same should apply if the system adds a new icon theme.
This commit is contained in:
Eli Schwartz 2019-07-23 01:11:19 -04:00
parent acc6beaad8
commit 4694efcfc9
No known key found for this signature in database
GPG Key ID: CEB167EFB5722BD6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/utils/open_with/linux.py
View File

@ -116,7 +116,7 @@ def find_icons():
with open(cache_file, 'rb') as f: with open(cache_file, 'rb') as f:
cache = f.read() cache = f.read()
cache = msgpack_loads(cache) cache = msgpack_loads(cache)
mtimes, cache = cache['mtimes'], cache['data'] mtimes, cache = defaultdict(int, cache['mtimes']), defaultdict(dict, cache['data'])
except Exception: except Exception:
mtimes, cache = defaultdict(int), defaultdict(dict) mtimes, cache = defaultdict(int), defaultdict(dict)