[Commits] [SCM] claws branch, master, updated. 3.10.1-160-gff9859c

[mones at claws-mail.org]

The branch, master has been updated
       via  ff9859c1a03eb7989276351e918b32b366aa5eee (commit)
      from  9e4d6e44b4b9324109d5d1aa045a94332109cc96 (commit)

Summary of changes:
 tools/tbird2claws.py |   22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)


- Log -----------------------------------------------------------------
commit ff9859c1a03eb7989276351e918b32b366aa5eee
Author: Ricardo Mones <ricardo at mones.org>
Date:   Thu Sep 18 10:35:22 2014 +0200

    Fix bug 3285 ‘modify tbird2claws.py to handle subdirectory’

diff --git a/tools/tbird2claws.py b/tools/tbird2claws.py
index e47290b..6144a68 100755
--- a/tools/tbird2claws.py
+++ b/tools/tbird2claws.py
@@ -95,19 +95,31 @@ def process_file(filepath, outputdir):
     offs = harvest_offsets(filepath)
     make_messages(outputdir, filepath, offs, 1)
 
+def clean_path(path):
+    """Rename all directories and subdirectories <X>.sbd to <X>
+    """
+    l = []
+    f = os.path.basename(path)
+    while f and f != "":
+        if f.endswith('.sbd'): 
+            f = f[:-4]
+        l.append(f)
+        path = os.path.dirname(path)
+        f = os.path.basename(path)
+    l.reverse()
+    r = os.path.join(*l)
+    return r
+
+
 
 def convert_tree(in_treepath, out_treepath):
     """Traverse your thunderbird tree, converting each message file found into
     a claws-mail message directory.
     """
     for path,subs,files in os.walk(in_treepath):
+        outpath = clean_path(path)
         if files:
             for f in [x for x in files if not x.endswith('.msf')]:
-                if path.endswith('.sbd'):
-                    outpath = path[:-4]
-                else:
-                    outpath = path
-                print path,f
                 process_file(os.path.join(path,f),
                              os.path.join(out_treepath,outpath,f))
     

-----------------------------------------------------------------------


hooks/post-receive
-- 
Claws Mail