Added a option to show GUID for editing/removing by it

Author: aki2o

geeknote/argparser.py

@@ -58,7 +58,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."},
             "--title":      {"altName": "-t",
                              "help": "Set new title of the note."},
@@ -76,7 +76,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."},
         },
         "flags": {
@@ -91,7 +91,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."},
         },
         "flags": {
@@ -134,6 +134,11 @@
                                  "help": "Search by content, not by title.",
                                  "value": True,
                                  "default": False},
+            "--guid":           {"altName": "-gi",
+                                 "help": "Replace ID with GUID "
+                                         "of each note in results.",
+                                 "value": True,
+                                 "default": False},
         }
     },
 
@@ -438,4 +443,4 @@ def printHelp(self):
                 out.printLine("Available flags:")
                 for flag in self.CMD_FLAGS:
                     out.printLine("%s : %s" % (flag.rjust(tab, " "),
-                                               self.CMD_FLAGS[flag]['help']))
+                                               self.CMD_FLAGS[flag]['help']))

geeknote/geeknote.py

@@ -741,34 +741,39 @@ 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)
+            result = self.getStorage().getSearch()
+            if result and tools.checkIsInt(note) and 1 <= int(note) <= len(result.notes):
+                note = result.notes[int(note) - 1]
 
-            logging.debug("Search notes: %s" % request)
-            result = self.getEvernote().findNotes(request, 20)
+            else:
+                request = self._createSearchRequest(search=note)
 
-            logging.debug("Search notes result: %s" % str(result))
-            if result.totalNotes == 0:
-                out.failureMessage("Notes have not been found.")
-                return tools.exitErr()
+                logging.debug("Search notes: %s" % request)
+                result = self.getEvernote().findNotes(request, 20)
 
-            elif result.totalNotes == 1 or self.selectFirstOnUpdate:
-                note = result.notes[0]
+                logging.debug("Search notes result: %s" % str(result))
+                if result.totalNotes == 0:
+                    out.failureMessage("Notes have not been found.")
+                    return tools.exitErr()
 
-            else:
-                logging.debug("Choose notes: %s" % str(result.notes))
-                note = out.SelectSearchResult(result.notes)
+                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))
         return note
 
     def find(self, search=None, tags=None, notebooks=None,
              date=None, exact_entry=None, content_search=None,
-             with_url=None, count=None, ):
+             with_url=None, count=None, guid=None):
 
         request = self._createSearchRequest(search, tags, notebooks,
                                             date, exact_entry,
@@ -804,8 +809,10 @@ 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, showGUID=guid)
 
     def _createSearchRequest(self, search=None, tags=None,
                              notebooks=None, date=None,

geeknote/out.py

@@ -226,7 +226,7 @@ def separator(symbol="", title=""):
 
 @preloaderStop
 def printList(listItems, title="", showSelector=False,
-              showByStep=20, showUrl=False):
+              showByStep=20, showUrl=False, showGUID=False):
 
     if title:
         separator("=", title)
@@ -237,7 +237,7 @@ def printList(listItems, title="", showSelector=False,
         key += 1
 
         printLine("%s : %s%s%s" % (
-            str(key).rjust(3, " "),
+            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,
             " " + (">>> " + config.NOTE_URL % item.guid) if showUrl else '',))

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'
 
@@ -359,6 +376,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):
         """