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

Try loading icon_data when it is a string assuming base64 encoded data

Browse Source
This commit is contained in:
Kovid Goyal 2020-10-19 09:32:13 +05:30
parent 653af227c1
commit f9cacdff88
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 37 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
src/calibre/gui2/open_with.py
View File

@ -5,23 +5,28 @@
__license__ = 'GPL v3' __license__ = 'GPL v3'
__copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>' __copyright__ = '2015, Kovid Goyal <kovid at kovidgoyal.net>'
import os, uuid import os
from threading import Thread import uuid
from contextlib import suppress
from functools import partial from functools import partial
from PyQt5.Qt import ( from PyQt5.Qt import (
QStackedLayout, QVBoxLayout, QWidget, QLabel, Qt, QAction, QBuffer, QByteArray, QIcon, QKeySequence, QLabel, QListWidget,
QListWidget, QSize, pyqtSignal, QListWidgetItem, QIcon, QByteArray, QListWidgetItem, QPixmap, QSize, QStackedLayout, Qt, QVBoxLayout, QWidget,
QBuffer, QPixmap, QAction, QKeySequence) pyqtSignal
)
from threading import Thread
from calibre import as_unicode from calibre import as_unicode
from calibre.constants import iswindows, ismacos from calibre.constants import ismacos, iswindows
from calibre.gui2 import error_dialog, choose_files, choose_images, elided_text, sanitize_env_vars, Application, choose_osx_app from calibre.gui2 import (
from calibre.gui2.widgets2 import Dialog Application, choose_files, choose_images, choose_osx_app, elided_text,
error_dialog, sanitize_env_vars
)
from calibre.gui2.progress_indicator import ProgressIndicator from calibre.gui2.progress_indicator import ProgressIndicator
from calibre.gui2.widgets2 import Dialog
from calibre.utils.config import JSONConfig from calibre.utils.config import JSONConfig
from calibre.utils.icu import numeric_sort_key as sort_key from calibre.utils.icu import numeric_sort_key as sort_key
from polyglot.builtins import iteritems, string_or_bytes, range, unicode_type from polyglot.builtins import iteritems, range, string_or_bytes, unicode_type
ENTRY_ROLE = Qt.UserRole ENTRY_ROLE = Qt.UserRole
@ -55,21 +60,33 @@ def entry_to_icon_text(entry, only_text=False):
if only_text: if only_text:
return entry.get('name', entry.get('Name')) or _('Unknown') return entry.get('name', entry.get('Name')) or _('Unknown')
data = entry.get('icon_data') data = entry.get('icon_data')
if isinstance(data, str):
with suppress(Exception):
from base64 import standard_b64decode
data = bytearray(standard_b64decode(data))
if not isinstance(data, (bytearray, bytes)): if not isinstance(data, (bytearray, bytes)):
icon = QIcon(I('blank.png')) icon = QIcon(I('blank.png'))
else: else:
pmap = QPixmap() pmap = QPixmap()
pmap.loadFromData(bytes(data)) pmap.loadFromData(bytes(data))
icon = QIcon(pmap) if pmap.isNull():
icon = QIcon(I('blank.png'))
else:
icon = QIcon(pmap)
return icon, entry.get('name', entry.get('Name')) or _('Unknown') return icon, entry.get('name', entry.get('Name')) or _('Unknown')
if iswindows: if iswindows:
# Windows {{{ # Windows {{{
from calibre.utils.winreg.default_programs import find_programs, friendly_app_name
from calibre.utils.open_with.windows import load_icon_resource, load_icon_for_cmdline
from calibre_extensions import winutil
import subprocess import subprocess
from calibre.utils.open_with.windows import (
load_icon_for_cmdline, load_icon_resource
)
from calibre.utils.winreg.default_programs import (
find_programs, friendly_app_name
)
from calibre_extensions import winutil
oprefs = JSONConfig('windows_open_with') oprefs = JSONConfig('windows_open_with')
def entry_sort_key(entry): def entry_sort_key(entry):
@ -156,7 +173,9 @@ if iswindows:
elif ismacos: elif ismacos:
# macOS {{{ # macOS {{{
oprefs = JSONConfig('osx_open_with') oprefs = JSONConfig('osx_open_with')
from calibre.utils.open_with.osx import find_programs, get_icon, entry_to_cmdline, get_bundle_data from calibre.utils.open_with.osx import (
entry_to_cmdline, find_programs, get_bundle_data, get_icon
)
def entry_sort_key(entry): def entry_sort_key(entry):
return sort_key(entry.get('name') or '') return sort_key(entry.get('name') or '')
@ -201,7 +220,9 @@ elif ismacos:
else: else:
# XDG {{{ # XDG {{{
oprefs = JSONConfig('xdg_open_with') oprefs = JSONConfig('xdg_open_with')
from calibre.utils.open_with.linux import entry_to_cmdline, find_programs, entry_sort_key from calibre.utils.open_with.linux import (
entry_sort_key, entry_to_cmdline, find_programs
)
def entry_to_item(entry, parent): def entry_to_item(entry, parent):
icon_path = entry.get('Icon') or I('blank.png') icon_path = entry.get('Icon') or I('blank.png')