Skip to content

Commit

Permalink
check device is present(not ejected) before sending files, fix bug #2
Browse files Browse the repository at this point in the history
  • Loading branch information
xxyzz committed Apr 20, 2021
1 parent bd1c395 commit 49d21f8
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 10 deletions.
5 changes: 3 additions & 2 deletions main.py
Expand Up @@ -6,7 +6,7 @@
from calibre.gui2.threaded_jobs import ThreadedJob
from calibre_plugins.worddumb.metadata import check_metadata
from calibre_plugins.worddumb.parse_job import do_job
from calibre_plugins.worddumb.send_file import kindle_connected, send
from calibre_plugins.worddumb.send_file import kindle_connected, SendFile
from calibre_plugins.worddumb.unzip import install_libs, load_json


Expand Down Expand Up @@ -68,6 +68,7 @@ def done(self, job, data=None, title=None):

# send files to device
if kindle_connected(self.gui):
send(self.gui, data)
sf = SendFile(self.gui, data)
sf.send_files(None)

self.gui.status_bar.show_message(f'Word Wise generated for {title}')
10 changes: 2 additions & 8 deletions send_file.py
Expand Up @@ -64,15 +64,9 @@ def move_file_to_device(self, file_path, device_book_path):
shutil.move(file_path, device_file_path)


def send(gui, data):
sf = SendFile(gui, data)
sf.send_files(None)


def kindle_connected(gui):
if not gui.device_manager.is_device_connected:
if not gui.device_manager.is_device_present:
return False
device = gui.device_manager.device
if device.VENDOR_ID != [0x1949]: # Kindle device
if gui.device_manager.device.VENDOR_NAME != 'KINDLE':
return False
return True

0 comments on commit 49d21f8

Please sign in to comment.