* Fix bad check on state directory

[rss2maildir.git] / rss2maildir.py

diff --git a/rss2maildir.py b/rss2maildir.py
index 910b8a913cf64ef9bc714cb2eefd72c28179a1ec..5d991e72363e254fe6d8604e38321b301aa19bfd 100755 (executable)
--- a/rss2maildir.py
+++ b/rss2maildir.py
@@ -70,6 +70,9 @@ class HTML2Text(HTMLParser):
         u'ul',
         u'ol',
         u'dl',
+        u'li',
+        u'dt',
+        u'dd',
         u'div',
         #u'blockquote',
         ]
@@ -180,21 +183,17 @@ class HTML2Text(HTMLParser):
         url = u''
         for attr in attrs:
             if attr[0] == 'alt':
-                alt = attr[1]
+                alt = attr[1].decode('utf-8')
             elif attr[0] == 'src':
-                url = attr[1]
+                url = attr[1].decode('utf-8')
         if url:
             self.curdata = self.curdata \
                 + u' [img:' \
-                + unicode( \
-                    url.encode('utf-8'), \
-                    'utf-8')
+                + url
             if alt:
                 self.curdata = self.curdata \
                     + u'(' \
-                    + unicode( \
-                        alt.encode('utf-8'), \
-                        'utf-8') \
+                    + alt \
                     + u')'
             self.curdata = self.curdata \
                 + u']'
@@ -223,10 +222,14 @@ class HTML2Text(HTMLParser):
             if self.ignorenodata:
                 newlinerequired = False
             self.ignorenodata = False
-            if newlinerequired \
-                and len(self.text) > 2 \
-                and self.text[-1] != u'\n' \
-                and self.text[-2] != u'\n':
+            if newlinerequired:
+                if tag_thats_done in [u'dt', u'dd', u'li'] \
+                    and len(self.text) > 1 \
+                    and self.text[-1] != u'\n':
+                        self.text = self.text + u'\n'
+                elif len(self.text) > 2 \
+                    and self.text[-1] != u'\n' \
+                    and self.text[-2] != u'\n':
                     self.text = self.text + u'\n\n'
 
         if tag_thats_done in ["h1", "h2", "h3", "h4", "h5", "h6"]:
@@ -721,11 +724,13 @@ if __name__ == "__main__":
     elif scp.has_option("general", "state_dir"):
         new_state_dir = scp.get("general", "state_dir")
         try:
-            mode = os.stat(state_dir)[stat.ST_MODE]
+            mode = os.stat(new_state_dir)[stat.ST_MODE]
             if not stat.S_ISDIR(mode):
                 sys.stderr.write( \
                     "State directory (%s) is not a directory\n" %(state_dir))
                 sys.exit(1)
+            else:
+                state_dir = new_state_dir
         except:
             # try to create it
             try: