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

Uses encoded library ids for safe transit

Browse Source
This commit is contained in:
Kovid Goyal 2020-11-10 16:12:44 +05:30
parent bcb324ffb9
commit cb1476c8ff
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/calibre/gui2/ui.py
View File

@ -631,8 +631,16 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
def handle_url_action(self, action, path, query):
import posixpath
def decode_library_id(x):
if x == '_':
return getattr(self.current_db.new_api, 'server_library_id', None) or '_'
if x.startswith('hex-'):
return bytes.fromhex(x[4:]).decode('utf-8')
return x
if action == 'switch-library':
library_id = posixpath.basename(path)
library_id = decode_library_id(posixpath.basename(path))
library_path = self.library_broker.path_for_library_id(library_id)
if library_path is not None and library_id != getattr(self.current_db.new_api, 'server_library_id', None):
self.library_moved(library_path)
@ -641,6 +649,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if len(parts) != 2:
return
library_id, book_id = parts
library_id = decode_library_id(library_id)
try:
book_id = int(book_id)
except Exception:
@ -664,6 +673,7 @@ class Main(MainWindow, MainWindowMixin, DeviceMixin, EmailMixin, # {{{
if len(parts) != 3:
return
library_id, book_id, fmt = parts
library_id = decode_library_id(library_id)
try:
book_id = int(book_id)
except Exception: