remove additional client in downloader

leVirve · May 26, 2017 · 445a137 · 445a137
1 parent f32032b
commit 445a137
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/dcard/dcard.py b/dcard/dcard.py
@@ -4,8 +4,7 @@
 
 from dcard.api import api
 from dcard.posts import Post
-from dcard.manager import Downloader
-from dcard.utils import Client, flatten_lists
+from dcard.utils import flatten_lists
 
 __all__ = ['Dcard']
 
@@ -14,10 +13,9 @@
 
 class Dcard:
 
-    def __init__(self, workers=8):
+    def __init__(self):
         self.forums = Forum()
         self.posts = Post()
-        Downloader.client = Client(workers=workers)
 
 
 class Forum:

diff --git a/dcard/manager.py b/dcard/manager.py
@@ -6,15 +6,14 @@
 import contextlib
 from multiprocessing.dummy import Pool
 
+from dcard.api import api
 from dcard.utils import flatten_lists
 
 logger = logging.getLogger(__name__)
 
 
 class Downloader:
 
-    client = None
-
     def __init__(
             self, download_folder=None, subfolder_pattern=None, flatten=False):
         self.resources_folder = download_folder or './downloads'
@@ -85,7 +84,7 @@ def downloading(cls, task):
 
         if os.path.exists(filepath):
             return True, src
-        response = cls.client.get_stream(src)
+        response = api.client.get_stream(src)
 
         if response.ok:
             cls.save_file(response, filepath)