diff --git a/src/calibre/customize/builtins.py b/src/calibre/customize/builtins.py index 33eae37b58..652b5cb335 100644 --- a/src/calibre/customize/builtins.py +++ b/src/calibre/customize/builtins.py @@ -1181,6 +1181,16 @@ class StoreBeWriteStore(StoreBase): headquarters = 'US' 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): 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.' @@ -1446,16 +1456,6 @@ class StoreZixoStore(StoreBase): headquarters = 'PL' 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 += [ StoreArchiveOrgStore, StoreAmazonKindleStore, @@ -1465,6 +1465,7 @@ plugins += [ StoreBNStore, StoreBeamEBooksDEStore, StoreBeWriteStore, + StoreChitankaStore, StoreDieselEbooksStore, StoreEbookNLStore, StoreEbookscomStore, @@ -1493,8 +1494,7 @@ plugins += [ StoreWHSmithUKStore, StoreWizardsTowerBooksStore, StoreWoblinkStore, - StoreZixoStore, - StoreChitankaStore + StoreZixoStore ] # }}} diff --git a/src/calibre/gui2/store/stores/chitanka_plugin.py b/src/calibre/gui2/store/stores/chitanka_plugin.py index e714d426e8..2ad236adec 100644 --- a/src/calibre/gui2/store/stores/chitanka_plugin.py +++ b/src/calibre/gui2/store/stores/chitanka_plugin.py @@ -67,11 +67,11 @@ class ChitankaStore(BasicStoreConfig, StorePlugin): txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href')) # remove .zip extensions - if fb2.find('.zip') <> -1: + if fb2.find('.zip') != -1: fb2 = fb2[:fb2.find('.zip')] - if epub.find('.zip') <> -1: + if epub.find('.zip') != -1: epub = epub[:epub.find('.zip')] - if txt.find('.zip') <> -1: + if txt.find('.zip') != -1: txt = txt[:txt.find('.zip')] counter -= 1 @@ -93,7 +93,7 @@ class ChitankaStore(BasicStoreConfig, StorePlugin): author_url = ''.join(data.xpath('.//a[contains(@href,"/person/")]/@href')) if counter <= 0: break - + print (author_url,) br2 = browser() with closing(br2.open(base_url + author_url, timeout=timeout)) as f: if counter <= 0: @@ -118,11 +118,11 @@ class ChitankaStore(BasicStoreConfig, StorePlugin): txt = ''.join(data.xpath('.//a[@class="dl dl-txt"]/@href')) # remove .zip extensions - if fb2.find('.zip') <> -1: + if fb2.find('.zip') != -1: fb2 = fb2[:fb2.find('.zip')] - if epub.find('.zip') <> -1: + if epub.find('.zip') != -1: epub = epub[:epub.find('.zip')] - if txt.find('.zip') <> -1: + if txt.find('.zip') != -1: txt = txt[:txt.find('.zip')] counter -= 1