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

Fix a regression that broke drag and drop of images from browsers to the book details panel on some platforms. Fixes #1879120 [Drag and Drop Image](https://bugs.launchpad.net/calibre/+bug/1879120)

Browse Source
This commit is contained in:
Kovid Goyal 2020-05-18 09:02:16 +05:30
parent 0e0bb48d51
commit a9365db837
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
2 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/gui2/book_details.py
View File

@ -772,7 +772,7 @@ class BookDetails(QWidget): # {{{
def dragEnterEvent(self, event): def dragEnterEvent(self, event):
md = event.mimeData() md = event.mimeData()
if dnd_has_extension(md, image_extensions() + BOOK_EXTENSIONS, allow_all_extensions=True) or \ if dnd_has_extension(md, image_extensions() + BOOK_EXTENSIONS, allow_all_extensions=True, allow_remote=True) or \
dnd_has_image(md): dnd_has_image(md):
event.acceptProposedAction() event.acceptProposedAction()

24
src/calibre/gui2/dnd.py
View File

@ -145,25 +145,37 @@ def data_as_string(f, md):
return raw return raw
remote_protocols = {'http', 'https', 'ftp'}
def urls_from_md(md): def urls_from_md(md):
ans = list(md.urls()) ans = list(md.urls())
if md.hasText(): if md.hasText():
# Chromium returns the url as text/plain on drag and drop of image # Chromium returns the url as text/plain on drag and drop of image
text = md.text() text = md.text()
if text and text.lstrip().partition(':')[0] in {'http', 'https', 'ftp'}: if text and text.lstrip().partition(':')[0] in remote_protocols:
u = QUrl(text.strip()) u = QUrl(text.strip())
if u.isValid(): if u.isValid():
ans.append(u) ans.append(u)
return ans return ans
def path_from_qurl(qurl): def path_from_qurl(qurl, allow_remote=False):
return qurl.toLocalFile() lf = qurl.toLocalFile()
if lf:
return lf
if not allow_remote:
return ''
if qurl.scheme() in remote_protocols:
path = qurl.path()
if path and '.' in path:
return path.rpartition('.')[-1]
return ''
def remote_urls_from_qurl(qurls, allowed_exts): def remote_urls_from_qurl(qurls, allowed_exts):
for qurl in qurls: for qurl in qurls:
if qurl.scheme() in {'http', 'https', 'ftp'} and posixpath.splitext( if qurl.scheme() in remote_protocols and posixpath.splitext(
qurl.path())[1][1:].lower() in allowed_exts: qurl.path())[1][1:].lower() in allowed_exts:
yield bytes(qurl.toEncoded()).decode('utf-8'), posixpath.basename(qurl.path()) yield bytes(qurl.toEncoded()).decode('utf-8'), posixpath.basename(qurl.path())
@ -172,7 +184,7 @@ def extension(path):
return path.rpartition('.')[-1].lower() return path.rpartition('.')[-1].lower()
def dnd_has_extension(md, extensions, allow_all_extensions=False): def dnd_has_extension(md, extensions, allow_all_extensions=False, allow_remote=False):
if DEBUG: if DEBUG:
prints('\nDebugging DND event') prints('\nDebugging DND event')
for f in md.formats(): for f in md.formats():
@ -183,7 +195,7 @@ def dnd_has_extension(md, extensions, allow_all_extensions=False):
if has_firefox_ext(md, extensions): if has_firefox_ext(md, extensions):
return True return True
urls = urls_from_md(md) urls = urls_from_md(md)
paths = [path_from_qurl(u) for u in urls] paths = [path_from_qurl(u, allow_remote=allow_remote) for u in urls]
exts = frozenset(filter(None, (extension(u) for u in paths if u))) exts = frozenset(filter(None, (extension(u) for u in paths if u)))
if DEBUG: if DEBUG:
repr_urls = [bytes(u.toEncoded()).decode('utf-8') for u in urls] repr_urls = [bytes(u.toEncoded()).decode('utf-8') for u in urls]