From 983cf1e52fc9f43d8cb65ed35ddd92e5831c3ef8 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Mon, 13 Jun 2011 21:07:52 -0600
Subject: [PATCH] Use a single driver for the Nook and Nook color

---
 src/calibre/customize/builtins.py  |  4 ++--
 src/calibre/devices/nook/driver.py | 33 ++++--------------------------
 2 files changed, 6 insertions(+), 31 deletions(-)

diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py
index b2268d3732..bdac284af2 100644
--- a/src/calibre/customize/builtins.py
+++ b/src/calibre/customize/builtins.py
@@ -594,7 +594,7 @@ from calibre.devices.iliad.driver import ILIAD
 from calibre.devices.irexdr.driver import IREXDR1000, IREXDR800
 from calibre.devices.jetbook.driver import JETBOOK, MIBUK, JETBOOK_MINI
 from calibre.devices.kindle.driver import KINDLE, KINDLE2, KINDLE_DX
-from calibre.devices.nook.driver import NOOK, NOOK_COLOR, NOOK_TSR
+from calibre.devices.nook.driver import NOOK, NOOK_COLOR
 from calibre.devices.prs505.driver import PRS505
 from calibre.devices.user_defined.driver import USER_DEFINED
 from calibre.devices.android.driver import ANDROID, S60
@@ -694,7 +694,7 @@ plugins += [
     KINDLE,
     KINDLE2,
     KINDLE_DX,
-    NOOK, NOOK_COLOR, NOOK_TSR,
+    NOOK, NOOK_COLOR,
     PRS505,
     ANDROID,
     S60,
diff --git a/src/calibre/devices/nook/driver.py b/src/calibre/devices/nook/driver.py
index 67c543a763..2fe8f667b0 100644
--- a/src/calibre/devices/nook/driver.py
+++ b/src/calibre/devices/nook/driver.py
@@ -81,13 +81,12 @@ class NOOK(USBMS):
         return [x.replace('#', '_') for x in components]
 
 class NOOK_COLOR(NOOK):
-    gui_name       = _('Nook Color')
-    description    = _('Communicate with the Nook Color eBook reader.')
+    description    = _('Communicate with the Nook Color and TSR eBook readers.')
 
-    PRODUCT_ID  = [0x002]
+    PRODUCT_ID  = [0x002, 0x003]
     BCD         = [0x216]
-    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOK_DISK'
 
+    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOK_DISK'
     EBOOK_DIR_MAIN = 'My Files'
 
     def upload_cover(self, path, filename, metadata, filepath):
@@ -102,31 +101,7 @@ class NOOK_COLOR(NOOK):
         is_news = mdata.tags and _('News') in mdata.tags
         subdir = 'Magazines' if is_news else 'Books'
         path = os.path.join(path, subdir)
-        return NOOK.create_upload_path(self, path, mdata, fname,
+        return USBMS.create_upload_path(self, path, mdata, fname,
                 create_dirs=create_dirs)
 
-class NOOK_TSR(NOOK):
-    gui_name       = _('Nook Simple')
-    description    = _('Communicate with the Nook TSR eBook reader.')
-
-    PRODUCT_ID  = [0x003]
-    BCD         = [0x216]
-
-    EBOOK_DIR_MAIN = 'My Files'
-    WINDOWS_MAIN_MEM = WINDOWS_CARD_A_MEM = 'EBOOK_DISK'
-
-    def upload_cover(self, path, filename, metadata, filepath):
-        pass
-
-    def get_carda_ebook_dir(self, for_upload=False):
-        if for_upload:
-            return self.EBOOK_DIR_MAIN
-        return ''
-
-    def create_upload_path(self, path, mdata, fname, create_dirs=True):
-        is_news = mdata.tags and _('News') in mdata.tags
-        subdir = 'Newspapers' if is_news else 'Books'
-        path = os.path.join(path, subdir)
-        return NOOK.create_upload_path(self, path, mdata, fname,
-                create_dirs=create_dirs)