Merge branch 'MattHulse-master'

Author: Vitaliy Rodnenko

geeknote/editor.py

@@ -93,8 +93,15 @@ def ENMLtoText(contentENML):
 
         Editor.checklistInENMLtoSoup(soup)
 
+        for section in soup.findAll('en-todo', checked='true'):
+            section.replace_with('[x]')
+
+        for section in soup.findAll('en-todo'):
+            section.replace_with('[ ]')
+
 #       content = html2text.html2text(soup.prettify())
         content = html2text.html2text(str(soup))
+
         content = re.sub(r' *\n', os.linesep, content)
 
         return content.encode('utf-8')
@@ -179,6 +186,10 @@ def textToENML(content, raise_ex=False, format='markdown'):
               contentHTML = u''.join(('<pre>', content, '</pre>')).encode("utf-8")
             else:
               contentHTML = Editor.HTMLEscape(content)
+
+            contentHTML = contentHTML.replace('[x]','<en-todo checked="true"></en-todo>')
+            contentHTML = contentHTML.replace('[ ]','<en-todo></en-todo>')
+
             return Editor.wrapENML(contentHTML)
         except:
             import traceback

geeknote/geeknote.py

@@ -804,51 +804,20 @@ def _createSearchRequest(self, search=None, tags=None,
         return request
 
 
-def modifyArgsByStdinStream():
-    """Parse the stdin stream for arguments"""
-    content = sys.stdin.read()
-    content = tools.stdinEncode(content)
-
-    if not content:
-        out.failureMessage("Input stream is empty.")
-        return tools.exitErr()
-
-    title = ' '.join(content.split(' ', 5)[:-1])
-    title = re.sub(r'(\r\n|\r|\n)', r' ', title)
-    if not title:
-        out.failureMessage("Error while creating title of note from stream.")
-        return tools.exitErr()
-    elif len(title) > 50:
-        title = title[0:50] + '...'
-
-    ARGS = {
-        'title': title,
-        'content': content
-    }
-
-    return ('create', ARGS)
-
-
 def main(args=None):
     try:
         exit_status_code = 0
 
-        # if terminal
-        if config.IS_IN_TERMINAL:
-            sys_argv = sys.argv[1:]
-            if isinstance(args, list):
-                sys_argv = args
+        sys_argv = sys.argv[1:]
+        if isinstance(args, list):
+            sys_argv = args
 
-            sys_argv = tools.decodeArgs(sys_argv)
+        sys_argv = tools.decodeArgs(sys_argv)
 
-            COMMAND = sys_argv[0] if len(sys_argv) >= 1 else None
+        COMMAND = sys_argv[0] if len(sys_argv) >= 1 else None
 
-            aparser = argparser(sys_argv)
-            ARGS = aparser.parse()
-
-        # if input stream
-        else:
-            COMMAND, ARGS = modifyArgsByStdinStream()
+        aparser = argparser(sys_argv)
+        ARGS = aparser.parse()
 
         # error or help
         if COMMAND is None or ARGS is False: