Added a option to show GUID of tag/notebook

Author: aki2o

geeknote/argparser.py

@@ -125,6 +125,16 @@
                                          "in results to Evernote web-version.",
                                  "value": True,
                                  "default": False},
+            "--with-tags":      {"altName": "-wt",
+                                 "help": "Add tag list of each note "
+                                         "in results.",
+                                 "value": True,
+                                 "default": False},
+            "--with-notebook":  {"altName": "-wn",
+                                 "help": "Add notebook of each note "
+                                         "in results.",
+                                 "value": True,
+                                 "default": False},
             "--exact-entry":    {"altName": "-ee",
                                  "help": "Search for exact "
                                          "entry of the request.",
@@ -134,7 +144,7 @@
                                  "help": "Search by content, not by title.",
                                  "value": True,
                                  "default": False},
-            "--guid":           {"altName": "-gi",
+            "--guid":           {"altName": "-id",
                                  "help": "Replace ID with GUID "
                                          "of each note in results.",
                                  "value": True,
@@ -145,6 +155,13 @@
     # Notebooks
     "notebook-list": {
         "help": "Show the list of existing notebooks in your Evernote.",
+        "flags": {
+            "--guid": {"altName": "-id",
+                       "help": "Replace ID with GUID "
+                               "of each notebook in results.",
+                       "value": True,
+                       "default": False},
+        }
     },
     "notebook-create": {
         "help": "Create new notebook.",
@@ -167,6 +184,13 @@
     # Tags
     "tag-list": {
         "help": "Show the list of existing tags in your Evernote.",
+        "flags": {
+            "--guid": {"altName": "-id",
+                       "help": "Replace ID with GUID "
+                               "of each note in results.",
+                       "value": True,
+                       "default": False},
+        }
     },
     "tag-create": {
         "help": "Create new tag.",

geeknote/geeknote.py

@@ -451,9 +451,9 @@ def settings(self, editor=None):
 class Tags(GeekNoteConnector):
     """ Work with auth Notebooks """
 
-    def list(self):
+    def list(self, guid=None):
         result = self.getEvernote().findTags()
-        out.printList(result)
+        out.printList(result, showGUID=guid)
 
     def create(self, title):
         self.connectToEvertone()
@@ -511,9 +511,9 @@ def _searchTag(self, tag):
 class Notebooks(GeekNoteConnector):
     """ Work with auth Notebooks """
 
-    def list(self):
+    def list(self, guid=None):
         result = self.getEvernote().findNotebooks()
-        out.printList(result)
+        out.printList(result, showGUID=guid)
 
     def create(self, title):
         self.connectToEvertone()
@@ -773,7 +773,8 @@ def _searchNote(self, note):
 
     def find(self, search=None, tags=None, notebooks=None,
              date=None, exact_entry=None, content_search=None,
-             with_url=None, count=None, guid=None):
+             with_url=None, with_tags=None, with_notebook=None,
+             count=None, guid=None):
 
         request = self._createSearchRequest(search, tags, notebooks,
                                             date, exact_entry,
@@ -812,7 +813,8 @@ def find(self, search=None, tags=None, notebooks=None,
         for note in result.notes:
             self.getStorage().setNote(note)
 
-        out.SearchResult(result.notes, request, showUrl=with_url, showGUID=guid)
+        out.SearchResult(result.notes, request, showUrl=with_url, showTags=with_tags,
+                         showNotebook=with_notebook, showGUID=guid)
 
     def _createSearchRequest(self, search=None, tags=None,
                              notebooks=None, date=None,

geeknote/out.py

@@ -226,7 +226,8 @@ def separator(symbol="", title=""):
 
 @preloaderStop
 def printList(listItems, title="", showSelector=False,
-              showByStep=20, showUrl=False, showGUID=False):
+              showByStep=20, showUrl=False, showTags=False,
+              showNotebook=False, showGUID=False):
 
     if title:
         separator("=", title)
@@ -236,10 +237,12 @@ def printList(listItems, title="", showSelector=False,
     for key, item in enumerate(listItems):
         key += 1
 
-        printLine("%s : %s%s%s" % (
+        printLine("%s : %s%s%s%s%s" % (
             item.guid if showGUID and hasattr(item, 'guid') else str(key).rjust(3, " "),
             printDate(item.created).ljust(18, " ") if hasattr(item, 'created') else '',
             item.title if hasattr(item, 'title') else item.name,
+            "".join( map(lambda s:" #"+s, item.tagGuids) ) if showTags and hasattr(item, 'tagGuids') and item.tagGuids else '',
+            " @"+item.notebookGuid if showNotebook and hasattr(item, 'notebookGuid') else '',
             " " + (">>> " + config.NOTE_URL % item.guid) if showUrl else '',))
 
         if key % showByStep == 0 and key < total: