Clean up debug_prints

Author: harmtemolder

__init__.py

@@ -1,55 +1,55 @@
-from __future__ import (unicode_literals, division, absolute_import, print_function)
+#!/usr/bin/env python3
 
-from calibre import browser
+from functools import partial
+
+from calibre.constants import numeric_version
 from calibre.customize import StoreBase
-from calibre.devices.usbms.driver import debug_print
+from calibre.devices.usbms.driver import debug_print as root_debug_print
 from calibre.gui2 import open_url
 from calibre.gui2.store import StorePlugin
 from calibre.gui2.store.search_result import SearchResult
 from calibre.gui2.store.web_store_dialog import WebStoreDialog
 from PyQt5.Qt import QUrl
 
-from .libgen_client import LibgenFictionClient
+from calibre_plugins.libgen_fiction.libgen_client import LibgenFictionClient
 
-store_version = 5  # Needed for dynamic plugin loading
+if numeric_version >= (5, 5, 0):
+    module_debug_print = partial(root_debug_print, ' the_eye:__init__:', sep='')
+else:
+    module_debug_print = partial(root_debug_print, 'the_eye:__init__:')
 
-__license__ = 'MIT'
-__copyright__ = 'fallaciousreasoning'
-__docformat__ = 'restructuredtext en'
+__license__        = 'MIT'
+__copyright__      = 'fallaciousreasoning'
+__docformat__      = 'restructuredtext en'
 
-PLUGIN_NAME = 'Libgen Fiction'
-PLUGIN_DESCRIPTION = 'Adds a Libgen Fiction search provider to Calibre'
-PLUGIN_AUTHORS = "fallaciousreasoning (https://github.com/fallaciousreasoning/CalibreLibgenStore)"
-PLUGIN_VERSION = (0, 2, 0)
+PLUGIN_NAME        = 'Libgen Fiction'
+PLUGIN_DESCRIPTION = 'Adds a Libgen Fiction search provider to calibre'
+PLUGIN_AUTHORS     = 'fallaciousreasoning (https://github.com/fallaciousreasoning/CalibreLibgenStore)'
+PLUGIN_VERSION     = (0, 4, 0)
 
 class LibgenStore(StorePlugin):
     def genesis(self):
-        '''
-        Initialize the Libgen Client
-        '''
-        debug_print('Libgen Fiction::__init__.py:LibgenStore:genesis')
+        """Initialize the Libgen Client
+        """
+        debug_print = partial(module_debug_print, 'LibgenStore:genesis:')
+        debug_print('start')
 
         self.libgen = LibgenFictionClient()
 
     def search(self, query, max_results=10, timeout=60):
-        '''
-        Searches LibGen for Books. Since the mirror links are not direct
+        """Searches LibGen for Books. Since the mirror links are not direct
         downloads, it should not provide these as `s.downloads`.
-        '''
-
-        debug_print('Libgen Fiction::__init__.py:LibgenStore:search:query =',
-                    query)
+        """
+        debug_print = partial(module_debug_print, 'LibgenStore:search:')
+        debug_print('search:query = ', query)
 
         libgen_results = self.libgen.search(query)
 
         for result in libgen_results.results[:min(max_results, len(libgen_results.results))]:
-            debug_print('Libgen Fiction::__init__.py:LibgenStore:search:'
-                        'result.title =',
-                        result.title)
+            debug_print('result.title = ', result.title)
 
             for mirror in result.mirrors[0:1]:  # Calibre only shows 1 anyway
-                debug_print('Libgen Fiction::__init__.py:LibgenStore:search:'
-                            'result.mirror.url =', mirror.url)
+                debug_print('result.mirror.url = ', mirror.url)
 
                 s = SearchResult()
 
@@ -64,27 +64,23 @@ def search(self, query, max_results=10, timeout=60):
                 s.formats = mirror.format
                 s.plugin_author = PLUGIN_AUTHORS
 
-                debug_print('Libgen Fiction::__init__.py:LibgenStore:search:s =',
-                            s)
+                debug_print('s = ', s)
 
                 yield s
 
     def open(self, parent=None, detail_item=None, external=False):
-        '''
-        Open the specified item in the external, or Calibre's browser
-        '''
-
-        debug_print('Libgen Fiction::__init__.py:LibgenStore:open:locals() =',
-                    locals())
+        """Open the specified item in the external, or Calibre's browser
+        """
+        debug_print = partial(module_debug_print, 'LibgenStore:open:')
+        debug_print('locals() = ', locals())
 
         detail_url = (
             self.libgen.get_detail_url(detail_item)
             if detail_item
             else self.libgen.base_url
         )
 
-        debug_print('Libgen Fiction::__init__.py:LibgenStore:open:detail_url =',
-                    detail_url)
+        debug_print('detail_url = ', detail_url)
 
         if external or self.config.get('open_external', False):
             open_url(QUrl(detail_url))
@@ -97,23 +93,20 @@ def open(self, parent=None, detail_item=None, external=False):
 
     def get_details(self, search_result, details):
         url = self.libgen.get_detail_url(search_result.detail_item)
-
         download = self.libgen.get_download_url(search_result.detail_item)
         search_result.downloads[search_result.formats] = download
-        
+
 class LibgenStoreWrapper(StoreBase):
     name                    = PLUGIN_NAME
     description             = PLUGIN_DESCRIPTION
-    supported_platforms     = ['windows', 'osx', 'linux']
     author                  = PLUGIN_AUTHORS
     version                 = PLUGIN_VERSION
-    minimum_calibre_version = (1, 0, 0)
+    minimum_calibre_version = (5, 0, 1)  # Because Python 3
     affiliate               = False
     drm_free_only           = True
 
     def load_actual_plugin(self, gui):
-        '''
-        This method must return the actual interface action plugin object.
-        '''
+        """This method must return the actual interface action plugin object.
+        """
         self.actual_plugin_object  = LibgenStore(gui, self.name)
         return self.actual_plugin_object

about.txt

@@ -1,5 +1,5 @@
 <p>Libgen Fiction</p>
 <ul>
-  <li>A Libgen Fiction store plugin for Calibre.</li>
+  <li>Adds a Libgen Fiction search provider to calibre.</li>
   <li>Please report any errors or requests on <a href="https://github.com/fallaciousreasoning/CalibreLibgenStore/issues">this plugin’s GitHub repository page</a>.</li>
 </ul>

libgen_client.py

@@ -1,9 +1,10 @@
+#!/usr/bin/env python3
+
 from lxml import etree
 import random
 import urllib
 
 
-
 def xpath(node, path):
     tree = node.getroottree()
     base_xpath = tree.getpath(node)