Merge branch 'master' of https://github.com/bernieke/geeknote into 3.0

Author: jeffkowalski

.gitignore

@@ -3,6 +3,7 @@
 # Packages
 *.egg
 *.egg-info
+.eggs
 dist
 build
 eggs

geeknote/editor.py

@@ -55,7 +55,7 @@ def getImages(contentENML):
         Creates a list of image resources to save.
         Each has a hash and extension attribute.
         """
-        soup = BeautifulSoup(contentENML)
+        soup = BeautifulSoup(contentENML.decode("utf-8"), features='lxml')
         imageList = []
         for section in soup.findAll("en-media"):
             if "type" in section.attrs and "hash" in section.attrs:

geeknote/geeknote.py

@@ -18,6 +18,7 @@
 from evernote.edam.notestore.ttypes import NotesMetadataResultSpec
 import evernote.edam.type.ttypes as Types
 from evernote.edam.limits.constants import EDAM_USER_NOTES_MAX
+from evernote.edam.error.ttypes import EDAMNotFoundException
 
 from .__init__ import __version__
 from . import config
@@ -148,6 +149,10 @@ def wrapper(wrapped_object, *args, **kwargs):
                             out.failureMessage("Unknown error")
                             tools.exitErr()
 
+                    elif isinstance(e, EDAMNotFoundException):
+                        out.failureMessage("EDAMNotFoundException on %s with key %s"
+                                           % (e.identifier, e.key))
+                        return None
                     else:
                         out.failureMessage("Operation failed")
                         traceback.print_exc()
@@ -327,7 +332,7 @@ def findNotes(
     @EdamException
     def loadNoteContent(self, note):
         """ modify Note object """
-        if not isinstance(note, Types.Note):
+        if not isinstance(note, object):
             raise Exception(
                 "Note content must be an " "instance of Note, '%s' given." % type(note)
             )
@@ -346,7 +351,7 @@ def loadNoteContent(self, note):
 
     @EdamException
     def loadLinkedNoteContent(self, note):
-        if not isinstance(note, Types.Note):
+        if not isinstance(note, object):
             raise Excetion(
                 "Note content must be an " "instance of Note, '%s' given." % type(note)
             )
@@ -623,6 +628,8 @@ def saveMedia(self, guid, mediaHash, filename):
         resource = self.getNoteStore().getResourceByHash(
             self.authToken, guid, mediaHash, True, False, False
         )
+        if resource == None:
+            return False
         open(filename, "w").write(resource.data.body)
         return True
 

geeknote/gnsync.py

@@ -389,7 +389,11 @@ def _create_file(self, note):
                     "imagesInSubdir" in self.imageOptions
                     and self.imageOptions["imagesInSubdir"]
                 ):
-                    os.mkdir(os.path.join(self.path, escaped_title + "_images"))
+                    try:
+                        os.mkdir(os.path.join(self.path, escaped_title + "_images"))
+                    except OSError:
+                        # Folder already exists
+                        pass
                     imagePath = os.path.join(
                         self.path, escaped_title + "_images", escaped_title
                     )
@@ -405,9 +409,10 @@ def _create_file(self, note):
                     )
                     logger.info("Saving image to {}".format(filename))
                     binaryHash = binascii.unhexlify(imageInfo["hash"])
-                    GeekNote(sleepOnRateLimit=self.sleep_on_ratelimit).saveMedia(
+                    if not GeekNote(sleepOnRateLimit=self.sleep_on_ratelimit).saveMedia(
                         note.guid, binaryHash, filename
-                    )
+                    ):
+                        logger.warning("Failed to save image {}".format(filename))
 
         content = Editor.ENMLtoText(note.content, self.imageOptions)
         path = os.path.join(self.path, escaped_title + self.extension)