Merge lp:~tomek3d/calibre/store into lp:~user-none/calibre/store

[Tomasz Długosz]

=== modified file 'src/calibre/gui2/store/stores/virtualo_plugin.py'
--- src/calibre/gui2/store/stores/virtualo_plugin.py	2012-01-19 18:47:19 +0000
+++ src/calibre/gui2/store/stores/virtualo_plugin.py	2012-06-10 14:02:24 +0000
@@ -40,39 +40,35 @@
         url = 'http://virtualo.pl/?q=' + urllib.quote(query) + '&f=format_id:4,6,3'
 
         br = browser()
-        drm_pattern = re.compile("ADE")
+        no_drm_pattern = re.compile("Znak wodny")
 
         counter = max_results
         with closing(br.open(url, timeout=timeout)) as f:
             doc = html.fromstring(f.read())
-            for data in doc.xpath('//div[@id="product_list"]/div/div[@class="column"]'):
+            for data in doc.xpath('//div[@id="content"]//div[@class="list_box list_box_border"]'):
                 if counter <= 0:
                     break
 
-                id = ''.join(data.xpath('.//table/tr[1]/td[1]/a/@href'))
+                id = ''.join(data.xpath('.//div[@class="list_middle_left"]//a/@href'))
                 if not id:
                     continue
 
                 price = ''.join(data.xpath('.//span[@class="price"]/text() | .//span[@class="price abbr"]/text()'))
-                cover_url = ''.join(data.xpath('.//table/tr[1]/td[1]/a/img/@src'))
-                title = ''.join(data.xpath('.//div[@class="title"]/a/text()'))
-                title = re.sub(r'\ WM', '', title)
-                author = ', '.join(data.xpath('.//div[@class="authors"]/a/text()'))
-                formats = ', '.join(data.xpath('.//span[@class="format"]/a/text()'))
-                formats = re.sub(r'(, )?ONLINE(, )?', '', formats)
-                drm = drm_pattern.search(formats)
-                formats = re.sub(r'(, )?ADE(, )?', '', formats)
-                formats = re.sub(r'\ WM', '', formats)
+                cover_url = ''.join(data.xpath('.//div[@class="list_middle_left"]//a/img/@src'))
+                title = ''.join(data.xpath('.//div[@class="list_title list_text_left"]/a/text()'))
+                author = ', '.join(data.xpath('.//div[@class="list_authors list_text_left"]/a/text()'))
+                formats = [ form.split('_')[-1].replace('.png', '') for form in data.xpath('.//div[@style="width:55%;float:left;text-align:left;height:18px;"]//img/@src')]
+                nodrm = no_drm_pattern.search(''.join(data.xpath('.//div[@style="width:45%;float:right;text-align:right;height:18px;"]/div/div/text()')))
 
                 counter -= 1
 
                 s = SearchResult()
                 s.cover_url = cover_url.split('.jpg')[0] + '.jpg'
-                s.title = title.strip() + ' ' + formats
+                s.title = title.strip()
                 s.author = author.strip()
                 s.price = price + ' zł'
                 s.detail_item = 'http://virtualo.pl' + id.strip().split('http://')[0]
-                s.formats = formats.upper().strip()
-                s.drm = SearchResult.DRM_LOCKED if drm else SearchResult.DRM_UNLOCKED
+                s.formats = ', '.join(formats).upper()
+                s.drm = SearchResult.DRM_UNLOCKED if nodrm else SearchResult.DRM_UNKNOWN
 
                 yield s