Fix #607

Nandaka · Jan 1, 2020 · 85b9313 · 85b9313
1 parent bb71753
commit 85b9313
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/PixivBookmark.py b/PixivBookmark.py
@@ -13,11 +13,11 @@ class PixivBookmark(object):
     __re_imageULItemsClass = re.compile(r".*\b_image-items\b.*")
 
     @staticmethod
-    def parseBookmark(page, root_directory):
+    def parseBookmark(page, root_directory, db_path):
         '''Parse favorite artist page'''
-        import PixivDBManager
+        from PixivDBManager import PixivDBManager
         bookmarks = list()
-        db = PixivDBManager.PixivDBManager(root_directory)
+        db = PixivDBManager(root_directory=root_directory, target=db_path)
         __re_member = re.compile(r'member\.php\?id=(\d*)')
         result = page.find(attrs={'class': 'members'}).findAll('a')
 

diff --git a/PixivDBManager.py b/PixivDBManager.py
@@ -9,7 +9,6 @@
 from datetime import datetime
 
 import PixivHelper
-from PixivException import PixivException
 from PixivListItem import PixivListItem
 
 script_path = PixivHelper.module_path()
@@ -873,8 +872,3 @@ def main(self):
         except BaseException:
             print('Error: ', sys.exc_info())
             self.main()
-
-
-if __name__ == '__main__':
-    apps = PixivDBManager(root_directory=".")
-    apps.main()
diff --git a/PixivUtil2.py b/PixivUtil2.py
@@ -23,7 +23,7 @@
 import PixivBrowserFactory
 import PixivConfig
 import PixivConstant
-import PixivDBManager
+from PixivDBManager import PixivDBManager
 import PixivHelper
 import PixivModelFanbox
 from PixivBookmark import PixivBookmark, PixivNewIllustBookmark
@@ -1194,7 +1194,7 @@ def get_bookmarks(hide, start_page=1, end_page=0, member_id=None):
         page = __br__.open_with_retry(url)
 
         parse_page = BeautifulSoup(page.read().decode("utf-8"), features="html5lib")
-        bookmarks = PixivBookmark.parseBookmark(parse_page, root_directory=__config__.rootDirectory)
+        bookmarks = PixivBookmark.parseBookmark(parse_page, root_directory=__config__.rootDirectory, db_path=__config__.dbPath)
         if len(bookmarks) == 0:
             print('No more data')
             break
@@ -2307,7 +2307,7 @@ def main():
         start_irfan_slide = False
 
     try:
-        __dbManager__ = PixivDBManager.PixivDBManager(root_directory=__config__.rootDirectory, target=__config__.dbPath)
+        __dbManager__ = PixivDBManager(root_directory=__config__.rootDirectory, target=__config__.dbPath)
         __dbManager__.createDatabase()
 
         if __config__.useList: