From 4c6599fd45b2b3f188d6cc09bdec9b2c209ec5c3 Mon Sep 17 00:00:00 2001
From: John Schember <john@nachtimwald.com>
Date: Thu, 16 Apr 2009 19:10:38 -0400
Subject: [PATCH] PRS505/700: Put books in author/title dir structure and use
 USBMS style / tag paths.

---
 src/calibre/devices/cybookg3/driver.py | 29 +++++++++++-----------
 src/calibre/devices/prs505/driver.py   | 33 ++++++++++++++++++++++----
 2 files changed, 43 insertions(+), 19 deletions(-)

diff --git a/src/calibre/devices/cybookg3/driver.py b/src/calibre/devices/cybookg3/driver.py
index 5458fbbffb..1cdf9863b4 100644
--- a/src/calibre/devices/cybookg3/driver.py
+++ b/src/calibre/devices/cybookg3/driver.py
@@ -77,22 +77,21 @@ class CYBOOKG3(USBMS):
             newpath = path
             mdata = metadata.next()
 
-            if self.SUPPORTS_SUB_DIRS:
-                if 'tags' in mdata.keys():
-                    for tag in mdata['tags']:
-                        if tag.startswith(_('News')):
-                            newpath = os.path.join(newpath, 'news')
-                            newpath = os.path.join(newpath, mdata.get('title', ''))
-                            newpath = os.path.join(newpath, mdata.get('timestamp', ''))
-                        elif tag.startswith('/'):
-                            newpath = path
-                            newpath += tag
-                            newpath = os.path.normpath(newpath)
-                            break
+            if 'tags' in mdata.keys():
+                for tag in mdata['tags']:
+                    if tag.startswith(_('News')):
+                        newpath = os.path.join(newpath, 'news')
+                        newpath = os.path.join(newpath, mdata.get('title', ''))
+                        newpath = os.path.join(newpath, mdata.get('timestamp', ''))
+                    elif tag.startswith('/'):
+                        newpath = path
+                        newpath += tag
+                        newpath = os.path.normpath(newpath)
+                        break
 
-                if newpath == path:
-                    newpath = os.path.join(newpath, mdata.get('authors', _('Unknown')))
-                    newpath = os.path.join(newpath, mdata.get('title', _('Unknown')))
+            if newpath == path:
+                newpath = os.path.join(newpath, mdata.get('authors', _('Unknown')))
+                newpath = os.path.join(newpath, mdata.get('title', _('Unknown')))
 
             if not os.path.exists(newpath):
                 os.makedirs(newpath)
diff --git a/src/calibre/devices/prs505/driver.py b/src/calibre/devices/prs505/driver.py
index efc48a2dff..a704eb1ec3 100644
--- a/src/calibre/devices/prs505/driver.py
+++ b/src/calibre/devices/prs505/driver.py
@@ -119,19 +119,44 @@ class PRS505(CLI, Device):
         paths, ctimes = [], []
 
         names = iter(names)
+        metadata = iter(metadata)
         for infile in files:
             close = False
             if not hasattr(infile, 'read'):
                 infile, close = open(infile, 'rb'), True
             infile.seek(0)
-            name = names.next()
-            paths.append(os.path.join(path, name))
-            if not os.path.exists(os.path.dirname(paths[-1])):
-                os.makedirs(os.path.dirname(paths[-1]))
+            
+            newpath = path
+            mdata = metadata.next()
+
+            if 'tags' in mdata.keys():
+                for tag in mdata['tags']:
+                    if tag.startswith(_('News')):
+                        newpath = os.path.join(newpath, 'news')
+                        newpath = os.path.join(newpath, mdata.get('title', ''))
+                        newpath = os.path.join(newpath, mdata.get('timestamp', ''))
+                    elif tag.startswith('/'):
+                        newpath = path
+                        newpath += tag
+                        newpath = os.path.normpath(newpath)
+                        break
+
+            if newpath == path:
+                newpath = os.path.join(newpath, mdata.get('authors', _('Unknown')))
+                newpath = os.path.join(newpath, mdata.get('title', _('Unknown')))
+
+            if not os.path.exists(newpath):
+                os.makedirs(newpath)
+
+            filepath = os.path.join(newpath, names.next())
+            paths.append(filepath)
+
             self.put_file(infile, paths[-1], replace_file=True)
+            
             if close:
                 infile.close()
             ctimes.append(os.path.getctime(paths[-1]))
+            
         return zip(paths, sizes, ctimes, cycle([on_card]))
 
     @classmethod