Merge remote-tracking branch 'upstream/main'

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,31 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: "[BUG]"
+labels: bug
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Enter `python zspotify -...`
+2. Enter '....'
+3. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**System Info:**
+ - OS: [e.g. Windows 11, Ubuntu 20.04]
+ - Release: [e.g. exe, docker, source]
+ - Version (If using a binary release)
+
+**Additional context**
+Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: "[FEATURE]"
+labels: enhancement
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

zspotify/app.py

@@ -259,8 +259,13 @@ def search(search_term):
         print('NO RESULTS FOUND - EXITING...')
     else:
         selection = ''
+        print('\n> SELECT A DOWNLOAD OPTION BY ID')
+        print('> SELECT A RANGE BY ADDING A DASH BETWEEN BOTH ID\'s')
+        print('> OR PARTICULAR OPTIONS BY ADDING A COMMA BETWEEN ID\'s')
+        print('> For example, typing 5 to get option 5 or 10-20 to get\nevery option from 10-20 (inclusive)\n')
+        print('> Or type 10,12,15,18 to get those options in particular')
         while len(selection) == 0:
-            selection = str(input('SELECT ITEM(S) BY S.NO: '))
+            selection = str(input('ID(s): '))
         inputs = split_input(selection)
         for pos in inputs:
             position = int(pos)

zspotify/playlist.py

@@ -2,7 +2,7 @@ from tqdm import tqdm
 
 from const import ITEMS, ID, TRACK, NAME
 from track import download_track
-from utils import fix_filename
+from utils import fix_filename, split_input
 from zspotify import ZSpotify
 
 MY_PLAYLISTS_URL = 'https://api.spotify.com/v1/me/playlists'
@@ -69,17 +69,18 @@ def download_from_user_playlist():
         print(str(count) + ': ' + playlist[NAME].strip())
         count += 1
 
+    selection = ''
     print('\n> SELECT A PLAYLIST BY ID')
     print('> SELECT A RANGE BY ADDING A DASH BETWEEN BOTH ID\'s')
+    print('> OR PARTICULAR OPTIONS BY ADDING A COMMA BETWEEN ID\'s')
     print('> For example, typing 10 to get one playlist or 10-20 to get\nevery playlist from 10-20 (inclusive)\n')
+    print('> Or type 10,12,15,18 to get those playlists in particular')
+    while len(selection) == 0:
+        selection = str(input('ID(s): '))
+    playlist_choices = map(int, split_input(selection))
 
-    playlist_choices = map(int, input('ID(s): ').split('-'))
+    for playlist_number in playlist_choices:
-
+        playlist = playlists[playlist_number - 1]
-    start = next(playlist_choices) - 1
-    end = next(playlist_choices, start + 1)
-
-    for playlist_number in range(start, end):
-        playlist = playlists[playlist_number]
         print(f'Downloading {playlist[NAME].strip()}')
         download_playlist(playlist)
 

zspotify/track.py

@@ -176,7 +176,7 @@ def convert_audio_format(filename) -> None:
     os.replace(filename, temp_filename)
 
     download_format = ZSpotify.get_config(DOWNLOAD_FORMAT).lower()
-    file_codec = CODEC_MAP.get(download_format, "copy")
+    file_codec = CODEC_MAP.get(download_format, 'copy')
     if file_codec != 'copy':
         bitrate = ZSpotify.get_config(BITRATE)
         if not bitrate: