Enable Qt SSL in the calibre windows build and a couple of fixes for the overdrive plugin

setup/installer/windows/freeze.py

@@ -13,7 +13,8 @@ from setup import Command, modules, functions, basenames, __version__, \
 from setup.build_environment import msvc, MT, RC
 from setup.installer.windows.wix import WixMixIn
 
-QT_DIR = 'Q:\\Qt\\4.7.1'
+OPENSSL_DIR = r'Q:\openssl'
+QT_DIR = 'Q:\\Qt\\4.7.2'
 QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns']
 LIBUSB_DIR       = 'C:\\libusb'
 LIBUNRAR         = 'C:\\Program Files\\UnrarDLL\\unrar.dll'
@@ -108,6 +109,8 @@ class Win32Freeze(Command, WixMixIn):
         self.dll_dir = self.j(self.base, 'DLLs')
         shutil.copytree(r'C:\Python%s\DLLs'%self.py_ver, self.dll_dir,
                 ignore=shutil.ignore_patterns('msvc*.dll', 'Microsoft.*'))
+        for x in glob.glob(self.j(OPENSSL_DIR, 'bin', '*.dll')):
+            shutil.copy2(x, self.dll_dir)
         for x in QT_DLLS:
             x += '4.dll'
             if not x.startswith('phonon'): x = 'Qt'+x

setup/installer/windows/notes.rst

@@ -53,12 +53,25 @@ SQLite
 
 Put sqlite3*.h from the sqlite windows amlgamation in ~/sw/include
 
+OpenSSL
+--------
+
+First install ActiveState Perl if you dont already have perl in windows
+Download and untar the openssl tarball, follow the instructions in INSTALL.W32 (use no-asm)
+to install use prefix q:\openssl
+
+perl Configure VC-WIN32 no-asm enable-static-engine --prefix=Q:/openssl
+ms\do_ms.bat
+nmake -f ms\ntdll.mak
+nmake -f ms\ntdll.mak test
+nmake -f ms\ntdll.mak install
+
 Qt
 --------
 
 Extract Qt sourcecode to C:\Qt\4.x.x. Run configure and make::
 
-    configure -opensource -release -qt-zlib -qt-gif -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license -nomake examples -nomake demos -nomake docs && nmake
+    configure -opensource -release -qt-zlib -qt-gif -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license -nomake examples -nomake demos -nomake docs -openssl -I Q:\openssl\include -L Q:\openssl\lib && nmake
 
 SIP
 -----

src/calibre/ebooks/metadata/sources/overdrive.py

@@ -9,7 +9,7 @@ __docformat__ = 'restructuredtext en'
 '''
 Fetch metadata using Overdrive Content Reserve
 '''
-import re, random, mechanize, copy
+import re, random, mechanize, copy, json
 from threading import RLock
 from Queue import Queue, Empty
 
@@ -43,7 +43,7 @@ class OverDrive(Source):
 
     def __init__(self, *args, **kwargs):
        Source.__init__(self, *args, **kwargs)
-       self.prefs.defaults['ignore_fields'] =['tags', 'pubdate', 'comments', 'identifier:isbn', 'language']
+       self.prefs.defaults['ignore_fields'] =['tags', 'pubdate', 'comments', 'identifier:isbn']
 
     def identify(self, log, result_queue, abort, title=None, authors=None, # {{{
             identifiers={}, timeout=30):
@@ -228,7 +228,7 @@ class OverDrive(Source):
     def sort_ovrdrv_results(self, raw, title=None, title_tokens=None, author=None, author_tokens=None, ovrdrv_id=None):
         close_matches = []
         raw = re.sub('.*?\[\[(?P<content>.*?)\]\].*', '[[\g<content>]]', raw)
-        results = eval(raw)
+        results = json.loads(raw)
         #print results
         # The search results are either from a keyword search or a multi-format list from a single ID,
         # sort through the results for closest match/format
@@ -392,7 +392,9 @@ class OverDrive(Source):
             from calibre.utils.date import parse_date
             mi.pubdate = parse_date(pub_date[0].strip())
         if lang:
-            mi.language = lang[0].strip()
+            lang = lang[0].strip().lower()
+            mi.language = {'english':'en', 'french':'fr', 'german':'de',
+                    'spanish':'es'}.get(lang, None)
 
         if ebook_isbn:
             #print "ebook isbn is "+str(ebook_isbn[0])