From ae64508a1e9d0f1b46b4ec0ce49f47e890c8d4f6 Mon Sep 17 00:00:00 2001
From: Chunxiao Li <lcx366@126.com>
Date: Fri, 24 Jul 2020 17:30:07 +0800
Subject: [PATCH] added resume progress bar

---
 pyatmos/.DS_Store             | Bin 8196 -> 8196 bytes
 pyatmos/msise/spaceweather.py |  12 ++----------
 pyatmos/msise/tqdmupto.py     |  19 -------------------
 pyatmos/msise/utils.py        |  27 +++++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 29 deletions(-)
 delete mode 100644 pyatmos/msise/tqdmupto.py

diff --git a/pyatmos/.DS_Store b/pyatmos/.DS_Store
index 14147294bd0eeaad154886e341a627eaee9506ac..fd0e248a22a90b4225502abb6bce7f8b9061acc6 100644
GIT binary patch
delta 53
zcmZp1XmOa3%y@ib;WYM%4ZNG#Ib=8{9}qmf`GY_z6PTeS@|1aE1IuQ1iEk{M8AaKc
G85saJt`h_R

delta 104
zcmZp1XmOa3%y@ER;WYM%4ZNG#Ib=8(Pfp%1*uX7OU2SA;s-s|JY&v<ZfGp$8$)^S6
s8E0*NEs(*4P-1LprlVkJVuq|_vVyS2W@nKD%$wOIzOiinDZ<VS05xzTX#fBK

diff --git a/pyatmos/msise/spaceweather.py b/pyatmos/msise/spaceweather.py
index d35d1a3..9b4e810 100644
--- a/pyatmos/msise/spaceweather.py
+++ b/pyatmos/msise/spaceweather.py
@@ -19,8 +19,6 @@ from datetime import datetime,timedelta
 from os import path,makedirs,remove
 from pathlib import Path
 from urllib.request import urlretrieve
-from colorama import Fore
-from .tqdmupto import TqdmUpTo
 
 # =================== download and update sw data  =================== #
 
@@ -58,21 +56,15 @@ def download_sw(direc=None):
     url = 'https://www.celestrak.com/SpaceData/SW-All.txt'
 
     if not path.exists(direc): makedirs(direc)
-    bar_format = "{l_bar}%s{bar}%s{r_bar}" % (Fore.BLUE, Fore.RESET)
     if not path.exists(swfile):
         desc = 'Downloading the latest space weather data from CELESTRAK'
-        with TqdmUpTo(unit='B', unit_scale=True, desc=desc,bar_format = bar_format,position=0) as t:
-            urlretrieve(url, swfile,reporthook=t.update_to)
-            t.total = t.n
-
+        tqdm_request(url,direc,'SW-All.txt',desc)
     else:
         modified_time = datetime.fromtimestamp(path.getmtime(swfile))
         if datetime.now() > modified_time + timedelta(days=1):
             remove(swfile)
             desc = 'Updating the space weather data from CELESTRAK'
-            with TqdmUpTo(unit='B', unit_scale=True, desc=desc,bar_format = bar_format,position=0) as t:
-                urlretrieve(url, swfile,reporthook=t.update_to)    
-                t.total = t.n
+            tqdm_request(url,direc,'SW-All.txt',desc)   
         else:
             print('The space weather data in {:s} is already the latest.'.format(direc))   
     return swfile
diff --git a/pyatmos/msise/tqdmupto.py b/pyatmos/msise/tqdmupto.py
deleted file mode 100644
index 5a7ba59..0000000
--- a/pyatmos/msise/tqdmupto.py
+++ /dev/null
@@ -1,19 +0,0 @@
-from tqdm import tqdm
-
-class TqdmUpTo(tqdm):
-    '''
-    Provides `update_to(n)` which uses `tqdm.update(delta_n)`.
-    For more details, please refer to https://pypi.org/project/tqdm/ 
-    '''
-    def update_to(self, b=1, bsize=1, tsize=None):
-        '''
-        b  : int, optional
-            Number of blocks transferred so far [default: 1].
-        bsize  : int, optional
-            Size of each block (in tqdm units) [default: 1].
-        tsize  : int, optional
-            Total size (in tqdm units). If [default: None] remains unchanged.
-        '''
-        if tsize is not None:
-            self.total = tsize
-        self.update(b * bsize - self.n)  # will also set self.n = b * bsize
\ No newline at end of file
diff --git a/pyatmos/msise/utils.py b/pyatmos/msise/utils.py
index 69a6a72..e1e0d6f 100644
--- a/pyatmos/msise/utils.py
+++ b/pyatmos/msise/utils.py
@@ -1,3 +1,6 @@
+import requests
+from tqdm import tqdm
+from colorama import Fore
 # ------------------------------------------------------------------- #
 # ----------------------------- utilities --------------------------- #
 # ------------------------------------------------------------------- #
@@ -31,3 +34,27 @@ def hms2s(h,m,s):
 def hms2h(h,m,s):
     return h + m/60 + s/3.6E3
 
+def tqdm_request(url,dir_to,file,desc):
+    block_size = 1024
+    bar_format = "{l_bar}%s{bar}%s{r_bar}" % (Fore.BLUE, Fore.RESET)
+    for idownload in range(5):
+        try:
+            local_file = open(dir_to + file, 'ab')
+            pos = local_file.tell()
+            resume_header = {'Range': f'bytes={pos}-'}
+            res = requests.get(url,stream=True,timeout=100,headers=resume_header)
+            total_size = int(res.headers.get('content-length', 0))
+            pbar = tqdm(desc = desc,total=total_size,unit='B',unit_scale=True,bar_format = bar_format,position=0,initial=pos)
+            for chunk in res.iter_content(block_size):
+                pbar.update(len(chunk))
+                local_file.write(chunk)  
+            break
+        except: 
+            sleep(2)
+            if idownload == 4:
+                remove(dir_to + file)
+                print('No response, skip this file.') 
+        finally:
+            pbar.close()    
+            local_file.close()    
+