Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prefixed root folder 'Document' if remote path does not contains one. #133

Merged
merged 2 commits into from
Dec 20, 2021
Merged

Prefixed root folder 'Document' if remote path does not contains one. #133

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2745e1d
Prefixed root folder 'Document' if remote path does not contains one.
vico Dec 17, 2021
899685a
Added prefix for display_document.
vico Dec 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 13 additions & 10 deletions dptrp1/cli/dptrp1.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
from pathlib import Path
from dptrp1.dptrp1 import DigitalPaper, find_auth_files, get_default_auth_files

ROOT_FOLDER = 'Document'

def do_screenshot(d, filename):
"""
Expand Down Expand Up @@ -52,8 +53,8 @@ def do_upload(d, local_path, remote_path=""):
Will upload to Document/ if only the local path is specified.
"""
if not remote_path:
remote_path = "Document/" + os.path.basename(local_path)
d.upload_file(local_path, remote_path)
remote_path = ROOT_FOLDER + "/" + os.path.basename(local_path)
d.upload_file(local_path, add_prefix(remote_path))

def do_upload_template(d, local_path, template_name=''):
"""
Expand All @@ -80,7 +81,7 @@ def do_download(d, remote_path, local_path):
f.write(data)


def do_list_document_info(d, remote_path=False):
def do_list_document_info(d, remote_path=''):
"""
Print metadata about a document on the device.
If no path is given, information is printed for every document on the device.
Expand All @@ -92,13 +93,13 @@ def do_list_document_info(d, remote_path=False):
for key in info:
print(" - " + key + ": " + info[key])
else:
info = d.list_document_info(remote_path)
info = d.list_document_info(add_prefix(remote_path))
print(info["entry_path"])
for key in info:
print(" - " + key + ": " + info[key])


def do_dispay_document(d, remote_path, page=1):
def do_display_document(d, remote_path, page=1):
"""
Displays the given document on the reader.
The path must be a valid path on the device.
Expand All @@ -108,23 +109,25 @@ def do_dispay_document(d, remote_path, page=1):
Example: dptrp1 display-document Document/Magazines/Comic.pdf 5
"""
info = d.list_document_info(remote_path)
info = d.list_document_info(add_prefix(remote_path))
d.display_document(info["entry_id"], page)


def do_update_firmware(d, local_path):
with open(local_path, "rb") as fwfh:
d.update_firmware(fwfh)

def add_prefix(remote_path: str) -> str:
return remote_path if remote_path.startswith(ROOT_FOLDER) else f'{ROOT_FOLDER}/{remote_path}'

def do_delete_document(d, remote_path):
d.delete_document(remote_path)
d.delete_document(add_prefix(remote_path))

def do_delete_template(d,remote_path):
d.delete_template(remote_path)

def do_delete_folder(d, remote_path):
d.delete_folder(remote_path)
d.delete_folder(add_prefix(remote_path))


def do_sync(d, local_path, remote_path="Document"):
Expand All @@ -140,7 +143,7 @@ def do_sync(d, local_path, remote_path="Document"):


def do_new_folder(d, remote_path):
d.new_folder(remote_path)
d.new_folder(add_prefix(remote_path))


def do_wifi_list(d):
Expand Down Expand Up @@ -284,7 +287,7 @@ def do_set_config(d, path):
"update-firmware": do_update_firmware,
"sync": do_sync,
"help": do_help,
"display-document": do_dispay_document,
"display-document": do_display_document,
"get-configuration": do_get_config,
"set-configuration": do_set_config,
}
Expand Down