jianguo
/
netease-cloud-music-dl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix output message format and truncating long strings.

This commit is contained in:
codezjx 2017-08-28 00:42:24 +08:00
parent 9cf08f5e4d
commit 1adf7db7c6
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ncm/downloader.py
View File

@ -99,12 +99,11 @@ class ProgressBar(object):
self.count = 0 self.count = 0
self.prev_count = 0 self.prev_count = 0
self.total = total self.total = total
self.status = 'Downloading:'
self.end_str = '\r' self.end_str = '\r'
def __get_info(self): def __get_info(self):
return '[{}] {:.2f}KB, Progress: {:.2f}%'\ return 'Progress: {:6.2f}%, {:8.2f}KB, [{:.30}]'\
.format(self.file_name, self.total/1024, self.count/self.total*100) .format(self.count/self.total*100, self.total/1024, self.file_name)
def refresh(self, count): def refresh(self, count):
self.count += count self.count += count
@ -114,7 +113,6 @@ class ProgressBar(object):
print(self.__get_info(), end=self.end_str) print(self.__get_info(), end=self.end_str)
# Finish downloading # Finish downloading
if self.count >= self.total: if self.count >= self.total:
self.status = 'Downloaded:'
self.end_str = '\n' self.end_str = '\n'
print(self.__get_info(), end=self.end_str) print(self.__get_info(), end=self.end_str)

6
ncm/start.py
View File

@ -20,7 +20,7 @@ def download_hot_songs(artist_id):
folder_path = os.path.join(config.DOWNLOAD_DIR, folder_name) folder_path = os.path.join(config.DOWNLOAD_DIR, folder_name)
download_count = config.DOWNLOAD_HOT_MAX if (0 < config.DOWNLOAD_HOT_MAX < 50) else config.DOWNLOAD_HOT_MAX_DEFAULT download_count = config.DOWNLOAD_HOT_MAX if (0 < config.DOWNLOAD_HOT_MAX < 50) else config.DOWNLOAD_HOT_MAX_DEFAULT
for i, song in zip(range(download_count), songs): for i, song in zip(range(download_count), songs):
print(str(i + 1) + ' song name:' + song['name']) print('{}: {}'.format(i + 1, song['name']))
download_song_by_song(song, folder_path, False) download_song_by_song(song, folder_path, False)
@ -29,7 +29,7 @@ def download_album_songs(album_id):
folder_name = format_string(songs[0]['album']['name']) + ' - album' folder_name = format_string(songs[0]['album']['name']) + ' - album'
folder_path = os.path.join(config.DOWNLOAD_DIR, folder_name) folder_path = os.path.join(config.DOWNLOAD_DIR, folder_name)
for i, song in enumerate(songs): for i, song in enumerate(songs):
print(str(i + 1) + ' song name:' + song['name']) print('{}: {}'.format(i + 1, song['name']))
download_song_by_song(song, folder_path, False) download_song_by_song(song, folder_path, False)
@ -38,7 +38,7 @@ def download_playlist_songs(playlist_id):
folder_name = format_string(playlist_name) + ' - playlist' folder_name = format_string(playlist_name) + ' - playlist'
folder_path = os.path.join(config.DOWNLOAD_DIR, folder_name) folder_path = os.path.join(config.DOWNLOAD_DIR, folder_name)
for i, song in enumerate(songs): for i, song in enumerate(songs):
print(str(i + 1) + ' song name:' + song['name']) print('{}: {}'.format(i + 1, song['name']))
download_song_by_song(song, folder_path, False) download_song_by_song(song, folder_path, False)