Fix Mac .DS_Store file bug

Author: littlecodersh

Diff for: LocalNote/controllers.py

@@ -89,7 +89,8 @@ def download_notes(self, update = True):
         noteDict = self.es.get_note_dict()
         invalidNoteList = []
         def _download_note(noteFullPath):
-            if any(c in ''.join(noteFullPath).decode('utf8') for c in u'\\/:*?"<>|\xa0'):
+            if (any(c in ''.join(noteFullPath).decode('utf8') for c in u'\\/:*?"<>|\xa0')
+                    or noteFullPath[1] == '.DS_Store'):
                 invalidNoteList.append(noteFullPath)
                 return
             print(('Downloading '+'/'.join(noteFullPath)).decode('utf8'))
@@ -113,7 +114,8 @@ def _download_note(noteFullPath):
         for noteFullPath, status in self.__get_changes(update):
             if status not in (-1, 0):
                 continue
-            elif any(c in ''.join(noteFullPath).decode('utf8') for c in u'\\/:*?"<>|\xa0'):
+            elif (any(c in ''.join(noteFullPath).decode('utf8') for c in u'\\/:*?"<>|\xa0')
+                    or noteFullPath[0] == '.DS_Store'):
                 invalidNoteList.append(noteFullPath)
                 continue
             elif 1 < len(noteFullPath):

Diff for: LocalNote/local/storage.py

@@ -114,8 +114,10 @@ def get_file_dict(self, notebooksList = None):
         for nbName in os.walk('.').next()[1]: # get folders
             nbNameUtf8 = self.__str_l2c(nbName)
             if notebooksList is not None and nbNameUtf8 not in notebooksList: continue
+            if nbNameUtf8 == '.DS_Store': continue # Mac .DS_Store ignorance
             fileDict[nbNameUtf8] = []
             for nName in reduce(lambda x,y: x+y, os.walk(nbName).next()[1:]): # get folders and files
+                if nName == '.DS_Store': continue # Mac .DS_Store ignorance
                 filePath = join(nbName, nName)
                 if os.path.isdir(filePath):
                     fileDict[nbNameUtf8].append((self.__str_l2c(nName), os.stat(filePath).st_mtime))
@@ -135,20 +137,27 @@ def check_files_format(self):
         r = [] # (filename, status) 1 for wrong placement, 2 for too large, 3 for missing main file
         notebooks, notes = os.walk('.').next()[1:]
         for note in notes:
-            if note != 'user.cfg': r.append((self.__str_l2c(note), 1))
+            if note not in ('user.cfg', '.DS_Store'): r.append((self.__str_l2c(note), 1))
         for notebook in notebooks:
+            if notebook == '.DS_Store': # Mac .DS_Store ignorance
+                r.append(('.DS_Store', 1))
+                continue
             folderNotes, notes = os.walk(notebook).next()[1:]
             for note in notes:
+                if note == '.DS_Store': continue# Mac .DS_Store ignorance
                 if re.compile('.+\.(md|html)').match(note):
                     if self.maxUpload < os.path.getsize(join(notebook, note)):
                         r.append((self.__str_l2c(join(notebook, note)), 2))
                 else:
                     r.append((self.__str_l2c(join(notebook, note)), 3))
             for folderNote in folderNotes:
+                if folderNote == '.DS_Store':
+                    r.append((self.__str_l2c(join(notebook, folderNote)), 1))
+                    continue# Mac .DS_Store ignorance
                 size = 0
                 wrongFolders, attas = os.walk(join(notebook, folderNote)).next()[1:]
                 if filter(lambda x: re.compile('.+\.(md|html)').match(x), attas) == []:
-                    r.append((self.__str_l2c(join(notebook, folderNote), 3)))
+                    r.append((self.__str_l2c(join(notebook, folderNote)), 3))
                 for atta in attas: size += os.path.getsize(join(notebook, folderNote, atta))
                 for wrongFolder in wrongFolders:
                     r.append((self.__str_l2c(join(notebook, folderNote, wrongFolder)), 1))

Diff for: LocalNote/main.py

@@ -6,7 +6,7 @@
 from local import clear_dir
 from exception import main_wrapper
 
-DEBUG = True
+DEBUG = False
 
 def sys_print(s, level = 'info'):
     print(('[%-4s] %s'%((level+' '*4)[:4].upper(), s.replace(u'\xa0', ' '))).encode(sys.stdin.encoding))
@@ -27,7 +27,8 @@ def _check_files_format(*args, **kwargs):
                         sys_print(u'检测到内容过大的文件：'+fileName.decode('utf8'), 'warn')
                     elif status == 3:
                         sys_print(u'检测到意义不明的文件：'+fileName.decode('utf8'), 'warn')
-                sys_print(u'请确保单条笔记有md或html的正文且不大于%s字节，笔记中没有文件夹格式的附件。'%mainController.ls.maxUpload, 'info')
+                sys_print(u'请确保单条笔记有md或html的正文且不大于%s字节'%mainController.ls.maxUpload)
+                sys_print(u'请确保没有文件夹格式的附件，或名为.DS_Store的笔记及笔记本。')
             else:
                 return fn(mainController, *args, **kwargs)
         else:
@@ -106,7 +107,8 @@ def pull(mainController, *args):
     if sys_input(u'是否更新本地文件？[yn] ') == 'y':
         r = mainController.download_notes(False)
         if isinstance(r, list):
-            sys_print(u'为存储到本地，请确保笔记名字中没有特殊字符“\\/:*?"<>|”或特殊的不可见字符')
+            sys_print(u'为存储到本地，请确保笔记名字中没有特殊字符“\\/:*?"<>|”或特殊不可见字符')
+            sys_print(u'为兼容Mac电脑，需要将名字为".DS_Store"的笔记本或笔记更名')
             for noteFullPath in r: sys_print('/'.join(noteFullPath).decode('utf8'))
     print('Bye~')
 @check_files_format

Diff for: README.md

@@ -71,10 +71,6 @@ Root
 
 # FAQ
 
-Q: 在使用时抛出了`errorCode=19`的异常，没有办法使用，怎么办？
-
-A: 这是你的账号每小时操作次数限制到了，等待一个小时再使用即可。完整异常为：`evernote.edam.error.ttypes.EDAMSystemException: EDAMSystemException(errorCode=19, rateLimitDuration=1039, _message=None)`。在被限制期间登录也会受限，所以会提示尚未登录。
-
 Q: 第一次使用需要下载很久么？
 
 A: 取决于你笔记中内容的多少，一般下载速度为200k/s。

Diff for: README.rst

@@ -75,10 +75,6 @@ Example file tree
 
 **FAQ**
 
-Q: I have an error `errorCode=19`, how should I deal with it?
-
-A: This is the hourly limit of evernote, you just need to wait for an hour. The whole Exception is `evernote.edam.error.ttypes.EDAMSystemException: EDAMSystemException(errorCode=19, rateLimitDuration=1039, _message=None)`. Login will also be limited in the hour, so warning about not loged in will be shown.
-
 Q: Will the first pull take a long time?
 
 A: It depands how big your files are, the downloading speed is about 200k/s.

Diff for: README_EN.md

@@ -70,10 +70,6 @@ Root
 
 # FAQ
 
-Q: I have an error `errorCode=19`, how should I deal with it?
-
-A: This is the hourly limit of evernote, you just need to wait for an hour. The whole Exception is `evernote.edam.error.ttypes.EDAMSystemException: EDAMSystemException(errorCode=19, rateLimitDuration=1039, _message=None)`. Login will also be limited in the hour, so warning about not loged in will be shown.
-
 Q: Will the first pull take a long time?
 
 A: It depands how big your files are, the downloading speed is about 200k/s.

Diff for: setup.py

@@ -16,7 +16,7 @@
 setup(
     name='LocalNote',
 
-    version='1.0.11',
+    version='1.0.14',
 
     description='LocalNote让你能够像使用本地文件一样使用印象笔记，支持markdown语法。Use your evernote like local file system in all platforms (markdown supported)',