Merge branch 'option-guid' of https://github.com/aki2o/geeknote

jeffkowalski · jeffkowalski · commit bb360cd9b2cd · 2015-11-19T21:21:39.000-08:00
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ The main functionality that we need is creating notes in Evernote.
                       [--created <date and time>]
                       [--resource <attachment filename>]
                       [--notebook <notebook where to save>]
-       	              [--reminder <date and time>]
+                      [--reminder <date and time>]
 ### Options
 
 --title &lt;title&gt;
@@ -188,14 +188,14 @@ Creating a new note and editing content in editor:
 With Geeknote you can edit your notes in Evernote using any editor you like. It could be nano, vi, vim etc ... You can edit notes right in console!
 
 ### Synopsis
-    $ geeknote edit --note <title of note which to edit>
+    $ geeknote edit --note <title or GUID of note to edit>
                     [--content <new content or "WRITE">]
                     [--title <the new title>]
                     [--tags <new list of data>]
                     [--created <date and time>]
                     [--resource <attachment filename>]
                     [--notebook <new notebook>]
-       	            [--reminder <date and time>]
+                    [--reminder <date and time>]
 
 ### Options
 
@@ -253,6 +253,9 @@ You can easily search notes in Evernote with Geeknote and get results in console
                     [--url-only]
                     [--reminders-only]
                     [--ignore-completed]
+                    [--with-tags]
+                    [--with-notebook]
+                    [--guid]
 ### Description
 With **find** you can make a search through your Evernote. It has an usefull options that allow you to make search more detail. Important notice, that Geeknote remembers the result of the last search. So, you can use the number of the note's position to make some actions that Geeknote can.
 For example:
@@ -293,12 +296,19 @@ That will show you the note "Shopping list 25.04.2012".
 :   Show results as a list of URLs to the every note in Evernote's web-client.
 
 --reminders-only
-: Include only notes with a reminder.
+:   Include only notes with a reminder.
 
 --ignore-completed
-: Include only unfinished reminders.
+:   Include only unfinished reminders.
 
+--with-tags
+:   Show tags of the note after note title.
 
+--with-notebook
+:   Show notebook which contains the note after note title.
+
+--guid
+:   Show GUID of the note as substitute for result index.
 
 ### Examples
     $ geeknote find --search "How to patch KDE2" --notebooks "jokes" --date 25.03.2012-25.06.2012
@@ -308,7 +318,7 @@ That will show you the note "Shopping list 25.04.2012".
 You can output any note in console using command *show* - that is add-on for *find*. When you use *show* it make search previously, and if the count of results more then 1, Geeknote will ask you to make a choise.
 
 ### Synopsis
-    $ geeknote show <text to search and show>
+    $ geeknote show <text or GUID to search and show>
 That is really simple, so doesn't need any descriptions. Just some examples:
 ### Examples
     $ geeknote show "Shop*"
@@ -334,7 +344,7 @@ As we mentioned before, *show* can use the results of previous search, so if you
 You can remove notes with Geeknotes from Evernote.
 
 ### Synopsis
-    $ geeknote remove --notebook <note name>
+    $ geeknote remove --notebook <note name or GUID>
                      [--force]
 ### Options
 
@@ -351,7 +361,11 @@ You can remove notes with Geeknotes from Evernote.
 ## Notebooks: show the list of notebooks
 Geeknote can display the list of all notebooks you have in Evernote.
 ### Synopsis
-    $ geeknote notebook-list
+    $ geeknote notebook-list [--guid]
+
+### Options
+--guid
+:   Show GUID of the notebook as substitute for result index.
 
 ## Notebooks: create the notebook
 With Geeknote you can create notebooks in Evernote right in console!
@@ -386,7 +400,11 @@ With Geeknote it's possible to rename existing notebooks in Evernote.
 ## Tags: show the list of tags
 You can get the list of all tags you have in Evernote.
 ### Synopsis
-    $ geeknote tag-list
+    $ geeknote tag-list [--guid]
+
+### Options
+--guid
+:   Show GUID of the tag as substitute for result index.
 
 ## Tags: create a new tag
 Usually tags are created with publishing new note. But if you need, you can create a new tag with Geeknote.
diff --git a/geeknote/argparser.py b/geeknote/argparser.py
@@ -88,7 +88,7 @@
         "firstArg": "--note",
         "arguments": {
             "--note":       {"altName": "-n",
-                             "help": "The name or ID from the "
+                             "help": "The name or GUID or ID from the "
                                      "previous search of a note to edit.",
                                      "required": True},
             "--title":      {"altName": "-t",
@@ -129,7 +129,7 @@
         "firstArg": "--note",
         "arguments": {
             "--note":  {"altName": "-n",
-                        "help": "The name or ID from the previous "
+                        "help": "The name or GUID or ID from the previous "
                                 "search of a note to remove.",
                                 "required": True},
         },
@@ -145,7 +145,7 @@
         "firstArg": "--note",
         "arguments": {
             "--note": {"altName": "-n",
-                       "help": "The name or ID from the previous "
+                       "help": "The name or GUID or ID from the previous "
                                "search of a note to show.",
                                "required": True},
         },
@@ -180,15 +180,26 @@
                                          "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.",
+                                 "help": "Search for exact entry of the request.",
                                  "value": True,
                                  "default": False},
             "--content-search": {"altName": "-cs",
                                  "help": "Search by content, not by title.",
                                  "value": True,
                                  "default": False},
+            "--guid":           {"altName": "-id",
+                                 "help": "Replace ID with GUID of each note in results.",
+                                 "value": True,
+                                 "default": False},
             "--reminders-only": {"altName": "-R",
                                  "help": "Include only notes with a reminder.",
                                  "value": True,
@@ -238,6 +249,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.",
@@ -261,6 +279,12 @@
     # 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.",
diff --git a/geeknote/geeknote.py b/geeknote/geeknote.py
@@ -600,9 +600,9 @@ def settings(self, editor=None, extras=None, note_ext=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.connectToEvernote()
@@ -661,9 +661,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, stack=None):
         self.connectToEvernote()
@@ -943,35 +943,37 @@ def _searchNote(self, note):
         note = tools.strip(note)
 
         # load search result
-        result = self.getStorage().getSearch()
-        if result and tools.checkIsInt(note) and 1 <= int(note) <= len(result.notes):
-            note = result.notes[int(note) - 1]
+        result = self.getStorage().getNote(note)
+        if result:
+            note = result
 
         else:
-            request = self._createSearchRequest(search=note)
-
-            logging.debug("Search notes: %s" % request)
-            result = self.getEvernote().findNotes(request, 20)
-
-            logging.debug("Search notes result: %s" % str(result))
-            if result.totalNotes == 0:
-                out.failureMessage("Notes have not been found.")
-                return tools.exitErr()
-
-            elif result.totalNotes == 1 or self.selectFirstOnUpdate:
-                note = result.notes[0]
-
+            result = self.getStorage().getSearch()
+            if result and tools.checkIsInt(note) and 1 <= int(note) <= len(result.notes):
+                note = result.notes[int(note) - 1]
             else:
-                logging.debug("Choose notes: %s" % str(result.notes))
-                note = out.SelectSearchResult(result.notes)
+                request = self._createSearchRequest(search=note)
+                logging.debug("Search notes: %s" % request)
+                result = self.getEvernote().findNotes(request, 20)
+                logging.debug("Search notes result: %s" % str(result))
+                if result.totalNotes == 0:
+                    out.failureMessage("Notes have not been found.")
+                    return tools.exitErr()
+                elif result.totalNotes == 1 or self.selectFirstOnUpdate:
+                    note = result.notes[0]
+
+                else:
+                    logging.debug("Choose notes: %s" % str(result.notes))
+                    note = out.SelectSearchResult(result.notes)
 
         logging.debug("Selected note: %s" % str(note))
         note = self.getEvernote().getNote(note.guid)
         return note
 
     def find(self, search=None, tags=None, notebooks=None,
              date=None, exact_entry=None, content_search=None,
-             with_url=None, count=None, ignore_completed=None, reminders_only=None,):
+             with_url=None, with_tags=None, with_notebook=None,
+             count=None, ignore_completed=None, reminders_only=None, guid=None):
 
         request = self._createSearchRequest(search, tags, notebooks,
                                             date, exact_entry,
@@ -995,8 +997,11 @@ def find(self, search=None, tags=None, notebooks=None,
         # save search result
         # print result
         self.getStorage().setSearch(result)
+        for note in result.notes:
+            self.getStorage().setNote(note)
 
-        out.SearchResult(result.notes, request, showUrl=with_url)
+        out.SearchResult(result.notes, request, showUrl=with_url, showTags=with_tags,
+                         showNotebook=with_notebook, showGUID=guid)
 
     def dedup(self, search=None, tags=None, notebooks=None,
               date=None, exact_entry=None, content_search=None,
diff --git a/geeknote/out.py b/geeknote/out.py
@@ -234,7 +234,8 @@ def separator(symbol="", title=""):
 
 @preloaderStop
 def printList(listItems, title="", showSelector=False,
-              showByStep=0, showUrl=False):
+              showByStep=0, showUrl=False, showTags=False,
+              showNotebook=False, showGUID=False):
 
     if title:
         separator("=", title)
@@ -244,11 +245,13 @@ def printList(listItems, title="", showSelector=False,
     for key, item in enumerate(listItems):
         key += 1
 
-        printLine("%s : %s%s%s%s" % (
-            str(key).rjust(3, " "),
+        printLine("%s : %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 '',
             printDate(item.updated).ljust(18, " ") if hasattr(item, 'updated') 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 showByStep != 0 and key % showByStep == 0 and key < total:
diff --git a/geeknote/storage.py b/geeknote/storage.py
@@ -81,6 +81,23 @@ def __repr__(self):
         return "<Tag('{0}')>".format(self.tag)
 
 
+class Note(Base):
+    __tablename__ = 'notes'
+
+    id = Column(Integer, primary_key=True)
+    guid = Column(String(1000))
+    obj = Column(PickleType())
+    timestamp = Column(DateTime(), nullable=False)
+
+    def __init__(self, guid, obj):
+        self.guid = guid
+        self.obj = obj
+        self.timestamp = datetime.datetime.now()
+
+    def __repr__(self):
+        return "<Note('{0}')>".format(self.timestamp)
+
+
 class Search(Base):
     __tablename__ = 'search'
 
@@ -372,6 +389,32 @@ def getNotebooks(self):
             result[item.guid] = item.name
         return result
 
+    @logging
+    def setNote(self, obj):
+        """
+        Set note.
+        """
+        for item in self.session.query(Note).filter(Note.guid == obj.guid).all():
+            self.session.delete(item)
+
+        note = pickle.dumps(obj)
+        instance = Note(obj.guid, note)
+        self.session.add(instance)
+
+        self.session.commit()
+        return True
+
+    @logging
+    def getNote(self, guid):
+        """
+        Get note by GUID.
+        """
+        note = self.session.query(Note).filter(Note.guid == guid).first()
+        if note:
+            return pickle.loads(note.obj)
+        else:
+            return None
+
     @logging
     def setSearch(self, search_obj):
         """
