Merge pull request #118 from Victrid/master

Template deletion, etc

dptrp1/cli/dptrp1.py

@@ -23,7 +23,7 @@ def do_screenshot(d, filename):
 def do_list_templates(d):
     data = d.list_templates()
     for d in data:
-        print(d)
+        print(d["template_name"])
 
 def do_list_documents(d):
     data = d.list_documents()
@@ -55,11 +55,16 @@ def do_upload(d, local_path, remote_path=""):
         remote_path = "Document/" + os.path.basename(local_path)
     d.upload_file(local_path, remote_path)
 
-def do_upload_template(d, local_path, remote_path=''):
-    if not remote_path:
-        remote_path = os.path.basename(local_path)
+def do_upload_template(d, local_path, template_name=''):
+    """
+    Upload a local document as a template for the reader.
+    The template name will be set as the file name if
+    only the local path is specified.
+    """
+    if not template_name:
+        template_name = os.path.basename(local_path)
     with open(local_path, 'rb') as f:
-        d.upload_template(f, remote_path)
+        d.upload_template(f, template_name)
 
 def do_download(d, remote_path, local_path):
     """
@@ -115,6 +120,8 @@ def do_update_firmware(d, local_path):
 def do_delete_document(d, remote_path):
     d.delete_document(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)
@@ -261,6 +268,7 @@ def do_set_config(d, path):
     "download": do_download,
     "delete": do_delete_document,
     "delete-folder": do_delete_folder,
+    "delete-template": do_delete_template,
     "new-folder": do_new_folder,
     "move-document": do_move_document,
     "copy-document": do_copy_document,

dptrp1/dptrp1.py

@@ -441,6 +441,13 @@ def delete_document(self, remote_path):
             # Path not found
             return
         self.delete_document_by_id(remote_id)
+
+    def delete_template(self,template_name):
+        template_list = self.list_templates()
+        for t in template_list:
+            if t['template_name']==template_name:
+                remote_id = t['note_template_id']
+                self.delete_template_by_id(remote_id)
 
     def display_document(self, document_id, page=1):
         info = {"document_id": document_id, "page": page}
@@ -459,6 +466,9 @@ def delete_document_by_id(self, doc_id):
 
     def delete_folder_by_id(self, folder_id):
         self._delete_endpoint(f"/folders/{folder_id}")
+
+    def delete_template_by_id(self, template_id):
+        self._delete_endpoint(f"/viewer/configs/note_templates/{template_id}")
 
     def upload_template(self, fh, remote_path):
         filename = os.path.basename(remote_path)
@@ -468,15 +478,10 @@ def upload_template(self, fh, remote_path):
         }
         r = self._post_endpoint("/viewer/configs/note_templates", data=info)
         doc = r.json()
-        print("doc is: {}".format(doc))
-        print ("r is : {}".format(r))
         doc_url = "/viewer/configs/note_templates/{}/file".format(doc["note_template_id"])
-
-        files = {
-            'file': (quote_plus(filename), fh, 'rb')
-        }
-        output = self._put_endpoint(doc_url, files=files)
-        print("output is {}".format(output))
+
+        files = { 'file': (quote_plus(filename), fh, 'rb') }
+        self._put_endpoint(doc_url, files=files)
 
     def upload(self, fh, remote_path):
         # Uploading a document should replace the existing document