|
|
@@ -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):
|