From 39559867aea73a72e5fde7df35ef1c9def7e4025 Mon Sep 17 00:00:00 2001
From: Charles Haley <>
Date: Mon, 13 Aug 2012 14:32:46 +0200
Subject: [PATCH] SmartDevice: better handling of very long strings (e.g., book
 data) in debug logs. Log the CC version build number if the client reports
 it.

---
 src/calibre/devices/smart_device_app/driver.py | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/calibre/devices/smart_device_app/driver.py b/src/calibre/devices/smart_device_app/driver.py
index 503f7d74a3..0d3ca9b729 100644
--- a/src/calibre/devices/smart_device_app/driver.py
+++ b/src/calibre/devices/smart_device_app/driver.py
@@ -177,7 +177,16 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                                                inspect.stack()[1][3]), end='')
         for a in args:
             try:
-                prints('', a, end='')
+                if isinstance(a, dict):
+                    printable = {}
+                    for k,v in a.iteritems():
+                        if isinstance(v, (str, unicode)) and len(v) > 50:
+                            printable[k] = 'too long'
+                        else:
+                            printable[k] = v
+                    prints('', printable, end='');
+                else:
+                    prints('', a, end='')
             except:
                 prints('', 'value too long', end='')
         print()
@@ -587,6 +596,7 @@ class SMART_DEVICE_APP(DeviceConfig, DevicePlugin):
                 self._debug('Protocol error - bogus book packet length')
                 self._close_device_socket()
                 return False
+            self._debug('CC version #:', result.get('ccVersionNumber', 'unknown'))
             self.max_book_packet_len = result.get('maxBookContentPacketLen',
                                                   self.BASE_PACKET_LEN)
             exts = result.get('acceptedExtensions', None)