Просмотр исходного кода

Added bitrate calculation and enabled dl continue question

Deben Oldert 6 лет назад
Родитель
Сommit
56060e96fe
3 измененных файлов с 14 добавлено и 6 удалено
  1. 6 4
      sites/helper/download.py
  2. 6 0
      sites/helper/item.py
  3. 2 2
      sites/helper/tagging.py

+ 6 - 4
sites/helper/download.py

@@ -1,5 +1,6 @@
 import console
 import sites.helper.tagging as tagging
+from sites.helper.item import Empty
 from .request import RawRequest
 from pyquery import PyQuery
 from settings import Settings
@@ -37,7 +38,7 @@ def download(item, type='GET', parameters=None, headers=None, cookies=None, stre
 
     full_name = '{0}/{1}'.format(Settings.tmpDir, name)
 
-    if item.bitrate is None and item.bytes is None:
+    if item.bitrate is Empty and item.bytes is None:
         size = file.headers.get('content-length')
         if size is not None:
             item.set_bytes(int(size))
@@ -58,7 +59,7 @@ def download(item, type='GET', parameters=None, headers=None, cookies=None, stre
 
 
 def savefileprogress(name, full_name, file, item):
-    console.output('Saving to: {0}'.format(full_name))
+    console.output('Saving to: {0}'.format(full_name), level=console.DBG_INFO)
     with open(full_name, 'wb') as f:
         progress = 0
         if item.bytes is not None:
@@ -84,10 +85,11 @@ def savefileprogress(name, full_name, file, item):
 
             tagging.write_tags_to_file(f, item)
 
-    console.output('Download of {0} completed!'.format(name))
-
     full_save_name = '{0}/{1}'.format(Settings.SaveDir, name)
     os.rename(full_name, full_save_name)
+    console.output('Moved to {0}'.format(full_save_name), level=console.DBG_INFO)
+
+    console.output('Download of {0} completed!'.format(name))
 
 
 def notExist(item):

+ 6 - 0
sites/helper/item.py

@@ -15,6 +15,12 @@ class EmptyAttr:
     def __getitem__(self, item):
         return None
 
+    def __eq__(self, other):
+        if other is None or other is Empty:
+            return True
+
+        return False
+
 
 Empty = EmptyAttr()
 

+ 2 - 2
sites/helper/tagging.py

@@ -36,8 +36,8 @@ def search_tags(item):
                                            ('ID', 2),
                                            ('Title', 50),
                                            ('Artist', 40),
-                                           ('Album', 50),
-                                           ('Label', 19)
+                                           ('Album', 40),
+                                           ('Label', 29)
                                        ])
     if picked_tag is not None:
         return items[picked_tag]