update gif & fix clear line

weilueluo · Aug 14, 2019 · bac31fe · bac31fe
1 parent 565cda7
commit bac31fe
Show file tree

Hide file tree

Showing 14 changed files with 22 additions and 10 deletions.
diff --git a/build/lib/pikax/api/androidclient.py b/build/lib/pikax/api/androidclient.py
@@ -3,10 +3,6 @@
 # for explaining https://oauth.secure.pixiv.net/auth/token
 #
 
-#
-# NOTE XXX This api is developing and not used by pikax yet
-#
-
 
 import datetime
 import time

diff --git a/build/lib/pikax/settings.py b/build/lib/pikax/settings.py
@@ -67,7 +67,7 @@
 """
 String to clear previous stdout line
 """
-CLEAR_LINE = '\b' * 300
+CLEAR_LINE = '\r' + ' ' * 150 + '\r'
 
 """
 Indicate a failure when there's too much exceptions occurred during requesting in the same loop

diff --git a/build/lib/pikax/util.py b/build/lib/pikax/util.py
@@ -262,6 +262,7 @@ def __init__(self):
         self.last_percent_print_time = None
         self.est_time_lefts = [0, 0, 0, 0, 0]
         self.start_time = None
+        self.last_printed_line = None
 
     def print_progress(self, curr, total, msg=None):
         curr_percent = math.floor(curr / total * 100)
@@ -300,7 +301,13 @@ def print_progress(self, curr, total, msg=None):
         if msg:
             progress_text = progress_text + ' | ' + str(msg)
 
+        if self.last_printed_line:
+            spaces = len(self.last_printed_line)
+        else:
+            spaces = 1
+
         log(progress_text, end='', start=settings.CLEAR_LINE, inform=True)
+        self.last_printed_line = progress_text
 
     def print_done(self, msg=None):
         if msg:
@@ -315,6 +322,7 @@ def print_done(self, msg=None):
         self.last_percent = None
         self.last_percent_print_time = None
         self.last_percent_time_left = None
+        self.last_printed_line = None
         self.est_time_lefts = [0, 0, 0]
 
 

diff --git a/demo.gif b/demo.gif
diff --git a/dist/pikax-2.0.7-py3-none-any.whl b/dist/pikax-2.0.7-py3-none-any.whl
diff --git a/dist/pikax-2.0.7.tar.gz b/dist/pikax-2.0.7.tar.gz
diff --git a/dist/pikax-2.0.8-py3-none-any.whl b/dist/pikax-2.0.8-py3-none-any.whl
diff --git a/dist/pikax-2.0.8.tar.gz b/dist/pikax-2.0.8.tar.gz
diff --git a/dist/pikax-2.0.9-py3-none-any.whl b/dist/pikax-2.0.9-py3-none-any.whl
diff --git a/dist/pikax-2.0.9.tar.gz b/dist/pikax-2.0.9.tar.gz
diff --git a/pikax.egg-info/PKG-INFO b/pikax.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pikax
-Version: 2.0.7
+Version: 2.0.9
 Summary: A Pixiv Mass Downloading Tool
 Home-page: https://github.com/Redcxx/Pikax
 Author: Redcxx
@@ -39,9 +39,9 @@ Description: # Pikax:unicorn:
         - 。。。
         - 有人再做吧，我自己够用了owo
         ## 试用 [demo.py](https://github.com/Redcxx/Pixiv-Crawler/blob/master/demo.py)
-        #### 下载当日排行榜前20的插画
+        #### 下载当日排行榜前50的插画
         ````
-          from pikax.pikax import Pikax, params
+          from pikax.pikax import Pikax
 
           pixiv = Pikax()
           results = pixiv.rank(limit=50)

diff --git a/pikax/settings.py b/pikax/settings.py
@@ -67,7 +67,7 @@
 """
 String to clear previous stdout line
 """
-CLEAR_LINE = '\b' * 300
+CLEAR_LINE = '\r' + ' ' * 150 + '\r'
 
 """
 Indicate a failure when there's too much exceptions occurred during requesting in the same loop

diff --git a/pikax/util.py b/pikax/util.py
@@ -262,6 +262,7 @@ def __init__(self):
         self.last_percent_print_time = None
         self.est_time_lefts = [0, 0, 0, 0, 0]
         self.start_time = None
+        self.last_printed_line = None
 
     def print_progress(self, curr, total, msg=None):
         curr_percent = math.floor(curr / total * 100)
@@ -300,7 +301,13 @@ def print_progress(self, curr, total, msg=None):
         if msg:
             progress_text = progress_text + ' | ' + str(msg)
 
+        if self.last_printed_line:
+            spaces = len(self.last_printed_line)
+        else:
+            spaces = 1
+
         log(progress_text, end='', start=settings.CLEAR_LINE, inform=True)
+        self.last_printed_line = progress_text
 
     def print_done(self, msg=None):
         if msg:
@@ -315,6 +322,7 @@ def print_done(self, msg=None):
         self.last_percent = None
         self.last_percent_print_time = None
         self.last_percent_time_left = None
+        self.last_printed_line = None
         self.est_time_lefts = [0, 0, 0]
 
 

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setuptools.setup(
     name="pikax",
-    version="2.0.7",
+    version="2.0.9",
     author="Redcxx",
     author_email="[email protected]",
     description="A Pixiv Mass Downloading Tool",