From ad8b03c4c048d4a5b811448abf6fceddee5efe27 Mon Sep 17 00:00:00 2001
From: Adrian
Date: Sat, 22 Sep 2018 19:37:30 +0300
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
=?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B1=D0=B0=D0=B3=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.gitignore | 1 +
README.md | 12 ++++-
audio.py | 83 ++++++++++++++++++-----------------
audio.ui | 7 +--
logo.ico | Bin 0 -> 5722 bytes
screenshots/group_tracks.png | Bin 0 -> 69811 bytes
screenshots/start_screen.png | Bin 0 -> 54241 bytes
screenshots/user_tracks.png | Bin 0 -> 59778 bytes
8 files changed, 56 insertions(+), 47 deletions(-)
create mode 100644 logo.ico
create mode 100644 screenshots/group_tracks.png
create mode 100644 screenshots/start_screen.png
create mode 100644 screenshots/user_tracks.png
diff --git a/.gitignore b/.gitignore
index 894a44c..b1a5a9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ build/
develop-eggs/
dist/
downloads/
+Output/
eggs/
.eggs/
lib/
diff --git a/README.md b/README.md
index 04cbb5e..2beb516 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,10 @@
-# vk-music-downloader
-Программа для скачивания музыки пользователей ВКонтакте
+# VkMusic Downloader
+Программа для скачивания музыки пользователей (сообществ) ВКонтакте
+
+Скриншоты:
+
+
+
+
+
+
diff --git a/audio.py b/audio.py
index e479dd0..e2d977f 100644
--- a/audio.py
+++ b/audio.py
@@ -61,12 +61,13 @@ def _get_user_audio(self, user_login, user_password, userlink):
me = api_vk.users.get()[0]
if not user_id:
user_id = None
+ # noinspection PyBroadException
try:
id = api_vk.users.get(user_ids=user_id)[0]
url = url.format(id['id'])
self.statusInfo.setText('Получение списка аудиозаписей пользователя: {} {}'.format(id['first_name'],
id['last_name']))
- except:
+ except Exception:
id = None
if not id:
group_id = api_vk.groups.getById(group_id=user_id)[0]
@@ -154,12 +155,14 @@ def _download_audio(self, track_list, directory):
download(track['link'], out=name, bar=None)
n += 1
self.change_progress(n)
- os.chdir('../')
return 'Скачивание завершено'
def run(self):
- result = self._download_audio(self.tracks, self.directory)
- self.signal.emit(result)
+ try:
+ result = self._download_audio(self.tracks, self.directory)
+ self.signal.emit(result)
+ except Exception as e:
+ self.signal.emit(e)
def change_progress(self, n):
self.int_signal.emit(n)
@@ -189,6 +192,9 @@ def __init__(self):
self.login.setText(info[0])
self.password.setText(info[1])
self.user_link.setText(info[2])
+
+ # TODO Реализовать автообновление программы
+ # update = QtWidgets.QMessageBox.question(self, 'Доступно обновление', 'Установить обновление 0.2.0')
self.tracks = None
self.string = None
@@ -214,11 +220,7 @@ def start(self):
self.get_audio.password = self.password.text()
self.get_audio.user_link = self.user_link.text()
self.get_audio.statusInfo = self.statusInfo
- self.btnConfirm.setEnabled(False)
- self.downloadAll.setEnabled(False)
- self.saveAll.setEnabled(False)
- self.saveWithoutLinks.setEnabled(False)
- self.downloadSelected.setEnabled(False)
+ self.toggle_buttons(False)
self.trackList.clear()
self.statusInfo.setText('Процесс получение аудиозаписей начался.\n')
self.get_audio.start()
@@ -227,25 +229,22 @@ def finished(self, result):
if result and isinstance(result, tuple):
self.tracks = result[0]
self.string = result[1]
- self.btnConfirm.setEnabled(True)
self.statusInfo.setText('Список аудиозаписей получен.\n{}, {} шт.'.format(self.string, len(self.tracks)))
- #row = 0
- self.saveAll.setEnabled(True)
- self.saveWithoutLinks.setEnabled(True)
- self.downloadSelected.setEnabled(True)
- self.downloadAll.setEnabled(True)
+ # row = 0
self.trackList.setEnabled(True)
- self.btnConfirm.setEnabled(True)
+ self.toggle_buttons(True)
for track in self.tracks:
self.trackList.addItem('%(artist)s — %(title)s' % track)
- #self.trackList.setRowCount(len(self.tracks))
- #self.trackList.setItem(row, 0, QtWidgets.QTableWidgetItem(track['artist']))
- #self.trackList.setItem(row, 1, QtWidgets.QTableWidgetItem(track['title']))
- #row += 1
- #self.trackList.resizeColumnsToContents()
+ # TODO Изучить работу с таблицами в PyQt5
+ # self.trackList.setRowCount(len(self.tracks))
+ # self.trackList.setItem(row, 0, QtWidgets.QTableWidgetItem(track['artist']))
+ # self.trackList.setItem(row, 1, QtWidgets.QTableWidgetItem(track['title']))
+ # row += 1
+ # self.trackList.resizeColumnsToContents()
elif isinstance(result, str):
self.btnConfirm.setEnabled(True)
- self.statusInfo.setText('\nОшибка: ' + result)
+ self.statusInfo.setText('Ошибка: {}'
+ '
'.format(result))
def save_all(self):
directory = QtWidgets.QFileDialog.getSaveFileName(self, 'Сохранить как', filter='Text files (*.txt)')[0]
@@ -280,14 +279,11 @@ def download_all(self):
self.progress_label.setEnabled(True)
self.progressBar.setEnabled(True)
self.progressBar.setMaximum(len(self.tracks))
- self.downloadAll.setEnabled(False)
- self.saveAll.setEnabled(False)
- self.saveWithoutLinks.setEnabled(False)
- self.downloadSelected.setEnabled(False)
- self.btnConfirm.setEnabled(False)
+ self.toggle_buttons(False)
self.download_audio.start()
def download_selected(self):
+ directory = None
selected = self.trackList.selectedItems()
selected_tracks = []
for element in selected:
@@ -305,25 +301,32 @@ def download_selected(self):
self.progress_label.setEnabled(True)
self.progressBar.setEnabled(True)
self.progressBar.setMaximum(len(selected_tracks))
- self.downloadAll.setEnabled(False)
- self.saveAll.setEnabled(False)
- self.saveWithoutLinks.setEnabled(False)
- self.downloadSelected.setEnabled(False)
- self.btnConfirm.setEnabled(False)
+ self.toggle_buttons(False)
self.download_audio.start()
+ else:
+ self.statusInfo.setText('