Fixed compare and ordering

This commit is contained in:
Alex Stanev 2011-07-19 09:11:08 +03:00
parent ff6324ea52
commit 17ab15dabe
2 changed files with 19 additions and 19 deletions

View File

@ -1181,6 +1181,16 @@ class StoreBeWriteStore(StoreBase):
headquarters = 'US' headquarters = 'US'
formats = ['EPUB', 'MOBI', 'PDF'] formats = ['EPUB', 'MOBI', 'PDF']
class StoreChitankaStore(StoreBase):
name = u'Моята библиотека'
author = 'Alex Stanev'
description = u'Независим сайт за DRM свободна литература на български език'
actual_plugin = 'calibre.gui2.store.stores.chitanka_plugin:ChitankaStore'
drm_free_only = True
headquarters = 'BG'
formats = ['FB2', 'EPUB', 'TXT', 'SFB']
class StoreDieselEbooksStore(StoreBase): class StoreDieselEbooksStore(StoreBase):
name = 'Diesel eBooks' name = 'Diesel eBooks'
description = u'Instant access to over 2.4 million titles from hundreds of publishers including Harlequin, HarperCollins, John Wiley & Sons, McGraw-Hill, Simon & Schuster and Random House.' description = u'Instant access to over 2.4 million titles from hundreds of publishers including Harlequin, HarperCollins, John Wiley & Sons, McGraw-Hill, Simon & Schuster and Random House.'
@ -1446,16 +1456,6 @@ class StoreZixoStore(StoreBase):
headquarters = 'PL' headquarters = 'PL'
formats = ['PDF, ZIXO'] formats = ['PDF, ZIXO']
class StoreChitankaStore(StoreBase):
name = u'Моята библиотека'
author = 'Alex Stanev'
description = u'Независим сайт за DRM свободна литература на български език'
actual_plugin = 'calibre.gui2.store.stores.chitanka_plugin:ChitankaStore'
drm_free_only = True
headquarters = 'BG'
formats = ['FB2', 'EPUB', 'TXT', 'SFB']
plugins += [ plugins += [
StoreArchiveOrgStore, StoreArchiveOrgStore,
StoreAmazonKindleStore, StoreAmazonKindleStore,
@ -1465,6 +1465,7 @@ plugins += [
StoreBNStore, StoreBNStore,
StoreBeamEBooksDEStore, StoreBeamEBooksDEStore,
StoreBeWriteStore, StoreBeWriteStore,
StoreChitankaStore,
StoreDieselEbooksStore, StoreDieselEbooksStore,
StoreEbookNLStore, StoreEbookNLStore,
StoreEbookscomStore, StoreEbookscomStore,
@ -1493,8 +1494,7 @@ plugins += [
StoreWHSmithUKStore, StoreWHSmithUKStore,
StoreWizardsTowerBooksStore, StoreWizardsTowerBooksStore,
StoreWoblinkStore, StoreWoblinkStore,
StoreZixoStore, StoreZixoStore
StoreChitankaStore
] ]
# }}} # }}}

View File

@ -67,11 +67,11 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href')) txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href'))
# remove .zip extensions # remove .zip extensions
if fb2.find('.zip') <> -1: if fb2.find('.zip') != -1:
fb2 = fb2[:fb2.find('.zip')] fb2 = fb2[:fb2.find('.zip')]
if epub.find('.zip') <> -1: if epub.find('.zip') != -1:
epub = epub[:epub.find('.zip')] epub = epub[:epub.find('.zip')]
if txt.find('.zip') <> -1: if txt.find('.zip') != -1:
txt = txt[:txt.find('.zip')] txt = txt[:txt.find('.zip')]
counter -= 1 counter -= 1
@ -93,7 +93,7 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
author_url = ''.join(data.xpath('.//a[contains(@href,"/person/")]/@href')) author_url = ''.join(data.xpath('.//a[contains(@href,"/person/")]/@href'))
if counter <= 0: if counter <= 0:
break break
print (author_url,)
br2 = browser() br2 = browser()
with closing(br2.open(base_url + author_url, timeout=timeout)) as f: with closing(br2.open(base_url + author_url, timeout=timeout)) as f:
if counter <= 0: if counter <= 0:
@ -118,11 +118,11 @@ class ChitankaStore(BasicStoreConfig, StorePlugin):
txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href')) txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href'))
# remove .zip extensions # remove .zip extensions
if fb2.find('.zip') <> -1: if fb2.find('.zip') != -1:
fb2 = fb2[:fb2.find('.zip')] fb2 = fb2[:fb2.find('.zip')]
if epub.find('.zip') <> -1: if epub.find('.zip') != -1:
epub = epub[:epub.find('.zip')] epub = epub[:epub.find('.zip')]
if txt.find('.zip') <> -1: if txt.find('.zip') != -1:
txt = txt[:txt.find('.zip')] txt = txt[:txt.find('.zip')]
counter -= 1 counter -= 1