spotify-cmd 0.1.2__tar.gz → 0.1.4__tar.gz

{spotify-cmd-0.1.2/spotify_cmd.egg-info → spotify-cmd-0.1.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spotify-cmd
-Version: 0.1.2
+Version: 0.1.4
 Summary: Command line Spotify client
 Home-page: https://github.com/ciembor/spotify-cmd
 Author: Maciej Ciemborowicz
@@ -25,11 +25,11 @@ License-File: LICENSE.md
 Requires-Dist: argparse==1.4.0
 Requires-Dist: configparser==5.0.2
 Requires-Dist: spotipy==2.23.0
-Requires-Dist: daemon==1.2
+Requires-Dist: python-daemon==3.0.1
 
-# 💚 spotify-cmd v0.1.2
+# 💚 spotify-cmd v0.1.3
 
-`spotify-cmd` is a Spotify client that allows controlling the playback of albums and playlists from a *user's library* (based on names or Spotify URIs) and individual tracks (based solely on Spotify URIs). The application is intended for use with [spotifyd](https://github.com/Spotifyd/spotifyd), but it works with any Spotify-enabled device.
+`spotify-cmd` is a Spotify client that allows controlling the playback of **albums and playlists from a user's library** (based on names or Spotify URIs) and individual tracks (based solely on Spotify URIs). The application is intended for use with [spotifyd](https://github.com/Spotifyd/spotifyd), but it works with any Spotify-enabled device.
 
 ## Installation
 
@@ -71,6 +71,7 @@ socket_buffer_size = 1024
 * `play`, `pause`, `next`, `previous`: Controls playback.
 * `set shuffle <on|off>`: Toggles shuffle mode.
 * `set volume <0-100>`: Sets the volume level.
+* `find <search_type> <query>`: Searches for items on Spotify. Acceptable search types are `album`, `artist`, `playlist`, `track`, `episode`, and `show`.
 
 ## Output Format
 
@@ -99,7 +100,7 @@ Developers can create interfaces for `spotify-cmd-daemon` using `/tmp/spotify-cm
 * Displaying tracks from specific albums or playlists.
 * MPRIS D-Bus interface support to reduce server queries.
 * `spotify-cmd-ui`: A ncurses-based UI for track display and control, working with the same daemon.
-* Search functionality.
+* ~~Search functionality.~~ [Done in 0.1.4]
 * Support for other resource types like artists.
 
 ## License

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/README.md

@@ -1,6 +1,6 @@
-# 💚 spotify-cmd v0.1.2
+# 💚 spotify-cmd v0.1.3
 
-`spotify-cmd` is a Spotify client that allows controlling the playback of albums and playlists from a *user's library* (based on names or Spotify URIs) and individual tracks (based solely on Spotify URIs). The application is intended for use with [spotifyd](https://github.com/Spotifyd/spotifyd), but it works with any Spotify-enabled device.
+`spotify-cmd` is a Spotify client that allows controlling the playback of **albums and playlists from a user's library** (based on names or Spotify URIs) and individual tracks (based solely on Spotify URIs). The application is intended for use with [spotifyd](https://github.com/Spotifyd/spotifyd), but it works with any Spotify-enabled device.
 
 ## Installation
 
@@ -42,6 +42,7 @@ socket_buffer_size = 1024
 * `play`, `pause`, `next`, `previous`: Controls playback.
 * `set shuffle <on|off>`: Toggles shuffle mode.
 * `set volume <0-100>`: Sets the volume level.
+* `find <search_type> <query>`: Searches for items on Spotify. Acceptable search types are `album`, `artist`, `playlist`, `track`, `episode`, and `show`.
 
 ## Output Format
 
@@ -70,7 +71,7 @@ Developers can create interfaces for `spotify-cmd-daemon` using `/tmp/spotify-cm
 * Displaying tracks from specific albums or playlists.
 * MPRIS D-Bus interface support to reduce server queries.
 * `spotify-cmd-ui`: A ncurses-based UI for track display and control, working with the same daemon.
-* Search functionality.
+* ~~Search functionality.~~ [Done in 0.1.4]
 * Support for other resource types like artists.
 
 ## License

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/setup.py

@@ -6,13 +6,13 @@ with open("README.md", "r", encoding="utf-8") as fh:
 
 setup(
     name="spotify-cmd",
-    version="0.1.2",
+    version="0.1.4",
     packages=find_packages(),
     install_requires=[
         'argparse==1.4.0',
         'configparser==5.0.2',
         'spotipy==2.23.0',
-        'daemon==1.2'
+        'python-daemon==3.0.1'
     ],
     entry_points={
         'console_scripts': [

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4/spotify_cmd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spotify-cmd
-Version: 0.1.2
+Version: 0.1.4
 Summary: Command line Spotify client
 Home-page: https://github.com/ciembor/spotify-cmd
 Author: Maciej Ciemborowicz
@@ -25,11 +25,11 @@ License-File: LICENSE.md
 Requires-Dist: argparse==1.4.0
 Requires-Dist: configparser==5.0.2
 Requires-Dist: spotipy==2.23.0
-Requires-Dist: daemon==1.2
+Requires-Dist: python-daemon==3.0.1
 
-# 💚 spotify-cmd v0.1.2
+# 💚 spotify-cmd v0.1.3
 
-`spotify-cmd` is a Spotify client that allows controlling the playback of albums and playlists from a *user's library* (based on names or Spotify URIs) and individual tracks (based solely on Spotify URIs). The application is intended for use with [spotifyd](https://github.com/Spotifyd/spotifyd), but it works with any Spotify-enabled device.
+`spotify-cmd` is a Spotify client that allows controlling the playback of **albums and playlists from a user's library** (based on names or Spotify URIs) and individual tracks (based solely on Spotify URIs). The application is intended for use with [spotifyd](https://github.com/Spotifyd/spotifyd), but it works with any Spotify-enabled device.
 
 ## Installation
 
@@ -71,6 +71,7 @@ socket_buffer_size = 1024
 * `play`, `pause`, `next`, `previous`: Controls playback.
 * `set shuffle <on|off>`: Toggles shuffle mode.
 * `set volume <0-100>`: Sets the volume level.
+* `find <search_type> <query>`: Searches for items on Spotify. Acceptable search types are `album`, `artist`, `playlist`, `track`, `episode`, and `show`.
 
 ## Output Format
 
@@ -99,7 +100,7 @@ Developers can create interfaces for `spotify-cmd-daemon` using `/tmp/spotify-cm
 * Displaying tracks from specific albums or playlists.
 * MPRIS D-Bus interface support to reduce server queries.
 * `spotify-cmd-ui`: A ncurses-based UI for track display and control, working with the same daemon.
-* Search functionality.
+* ~~Search functionality.~~ [Done in 0.1.4]
 * Support for other resource types like artists.
 
 ## License

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/spotify_cmd.egg-info/SOURCES.txt

@@ -14,6 +14,7 @@ src/common/socket_data_handler.py
 src/common/socket_message.py
 src/spotify_cmd_client/__init__.py
 src/spotify_cmd_client/client.py
+src/spotify_cmd_client/data_presenter.py
 src/spotify_cmd_client/main.py
 src/spotify_cmd_daemon/__init__.py
 src/spotify_cmd_daemon/main.py
@@ -26,6 +27,7 @@ src/spotify_cmd_daemon/operations/next_track.py
 src/spotify_cmd_daemon/operations/pause_playback.py
 src/spotify_cmd_daemon/operations/previous_track.py
 src/spotify_cmd_daemon/operations/resume_playback.py
+src/spotify_cmd_daemon/operations/search.py
 src/spotify_cmd_daemon/operations/set_shuffle.py
 src/spotify_cmd_daemon/operations/set_volume.py
 src/spotify_cmd_daemon/operations/start_playback.py
@@ -35,6 +37,14 @@ src/spotify_cmd_daemon/operations/helpers/get_album.py
 src/spotify_cmd_daemon/operations/helpers/get_playlist.py
 src/spotify_cmd_daemon/operations/helpers/get_resource_from_library.py
 src/spotify_cmd_daemon/operations/helpers/get_resource_uri.py
+src/spotify_cmd_daemon/operations/presenters/__init__.py
+src/spotify_cmd_daemon/operations/presenters/albums_presenter.py
+src/spotify_cmd_daemon/operations/presenters/artists_presenter.py
+src/spotify_cmd_daemon/operations/presenters/collection_presenter.py
+src/spotify_cmd_daemon/operations/presenters/episodes_presenter.py
+src/spotify_cmd_daemon/operations/presenters/playlists_presenter.py
+src/spotify_cmd_daemon/operations/presenters/shows_presenter.py
+src/spotify_cmd_daemon/operations/presenters/tracks_presenter.py
 src/spotify_cmd_daemon/operations/validators/__init__.py
 src/spotify_cmd_daemon/operations/validators/validate_resource_uri.py
 src/spotify_cmd_daemon/operations/validators/validate_volume_percent.py

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/spotify_cmd.egg-info/requires.txt

@@ -1,4 +1,4 @@
 argparse==1.4.0
 configparser==5.0.2
 spotipy==2.23.0
-daemon==1.2
+python-daemon==3.0.1

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/src/spotify_cmd_client/client.py

@@ -9,6 +9,7 @@ import json
 from socket_message import SocketMessage
 from socket_data_handler import SocketDataHandler
 from config import Config
+from .data_presenter import DataPresenter
 
 class Client:
     def __init__(self):
@@ -43,38 +44,9 @@ class Client:
                     formatted_response = json.dumps(response_dict['payload'], indent=2)
                     print(formatted_response)
                 else:
-                    self.__print_output(response_dict['payload'])
+                    DataPresenter.print_output(response_dict['payload'])
         except socket.error as msg:
             print(f"Error receiving response from daemon: {msg}")
 
     def close(self):
         self.sock.close()
-
-    def __print_output(self, data):
-        if 'error' in data:
-            print(f"Error: {data['error']}")
-        elif 'notification' in data:
-            print(data['notification'])
-        elif 'albums' in data:
-            self.__print_collection('albums', data['albums'])
-        elif 'playlists' in data:
-            self.__print_collection('playlists', data['playlists'])
-
-    def __print_collection(self, type, items):
-        print("──────────────────────────────────────────")
-        for item in items:
-            if (type=='albums'):
-                self.__print_album(item)
-            elif (type=='playlists'):
-                self.__print_playlist(item)
-            print("──────────────────────────────────────────")
-
-    def __print_album(self, album_data):
-        print(f"Artist: {album_data['artists']}")
-        print(f"Album: {album_data['name']}")
-        print(f"URI: spotify:album:{album_data['spotify_id']}")
-
-    def __print_playlist(self, playlist_data):
-        print(f"Owner: {playlist_data['owner']}")
-        print(f"Name: {playlist_data['name']}")
-        print(f"URI: spotify:playlist:{playlist_data['spotify_id']}")

spotify-cmd-0.1.4/src/spotify_cmd_client/data_presenter.py

@@ -0,0 +1,59 @@
+class DataPresenter:
+    PRINT_TEMPLATES = {
+        'albums': [
+            ('Artist', 'artists'),
+            ('Album', 'name'),
+            ('URI', lambda d: f"spotify:album:{d['spotify_id']}")
+        ],
+        'artists': [
+            ('Artist', 'name'),
+            ('Followers', 'followers'),
+            ('URI', lambda d: f"spotify:artist:{d['spotify_id']}")
+        ],
+        'playlists': [
+            ('Owner', 'owner'),
+            ('Name', 'name'),
+            ('URI', lambda d: f"spotify:playlist:{d['spotify_id']}")
+        ],
+        'tracks': [
+            ('Artist', 'artists'),
+            ('Name', 'name'),
+            ('URI', lambda d: f"spotify:track:{d['spotify_id']}")
+        ],
+        'episodes': [
+            ('Name', 'name'),
+            ('Description', 'description'),
+            ('URI', lambda d: f"spotify:episode:{d['spotify_id']}")
+        ],
+        'shows': [
+            ('Name', 'name'),
+            ('Description', 'description'),
+            ('URI', lambda d: f"spotify:show:{d['spotify_id']}")
+        ],
+    }
+
+    @staticmethod
+    def print_output(data):
+        if 'error' in data:
+            print(f"Error: {data['error']}")
+        elif 'notification' in data:
+            print(data['notification'])
+        else:
+            for key, value in data.items():
+                if key in DataPresenter.PRINT_TEMPLATES:
+                    DataPresenter.__print_collection(key, value)
+                    break
+
+    @staticmethod
+    def __print_collection(collection_type, items):
+        horizontal_line = "─" * 50
+        print(horizontal_line)
+        for item in items:
+            DataPresenter.__print_item(collection_type, item)
+            print(horizontal_line)
+
+    @staticmethod
+    def __print_item(collection_type, item_data):
+        for label, key in DataPresenter.PRINT_TEMPLATES[collection_type]:
+            value = key(item_data) if callable(key) else item_data[key]
+            print(f"{label}: {value}")

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/src/spotify_cmd_client/main.py

@@ -45,6 +45,10 @@ def main():
     play_uri_parser = play_type_parser.add_parser('uri', help='play resource by spotify URI')
     play_uri_parser.add_argument('uri', type=str, help='spotify uri')
 
+    find_parser = subparsers.add_parser('find', help='find items based on search query')
+    find_parser.add_argument('search_type', choices=['album', 'artist', 'playlist', 'track', 'episode', 'show'], help='type of item to find')
+    find_parser.add_argument('search_query', type=str, help='search query string')
+
     parser.add_argument('--format', choices=['json', 'text', 'verbose'], default='text', help='output format')
 
     args = parser.parse_args()
@@ -52,8 +56,14 @@ def main():
     payload = {
         'command': args.command,
         'setting': getattr(args, 'setting', None),
-        'type': getattr(args, 'get_type', None) or getattr(args, 'play_type', None),
-        'value': getattr(args, 'state', None) or getattr(args, 'level', None) or getattr(args, 'name', None) or getattr(args, 'uri', None)
+        'type': (getattr(args, 'get_type', None) or
+                 getattr(args, 'play_type', None) or
+                 getattr(args, 'search_type', None)),
+        'value': (getattr(args, 'state', None) or
+                  getattr(args, 'level', None) or
+                  getattr(args, 'name', None) or
+                  getattr(args, 'uri', None) or
+                  getattr(args, 'search_query', None))
     }
 
     client = Client()

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/src/spotify_cmd_daemon/main.py

@@ -23,9 +23,9 @@ args = parser.parse_args()
 spotify = SpotifyController()
 server = SocketServer(spotify)
 
-lock_file = "/tmp/myapp.lock"
+lock_file = "/tmp/spotify-cmd-daemon.lock"
 if os.path.exists(lock_file):
-    print("Application already running.")
+    print(f"Daemon already running ({lock_file} exists).")
     sys.exit(1)
 else:
     with open(lock_file, 'w'): pass

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/src/spotify_cmd_daemon/operations/__init__.py

@@ -7,3 +7,4 @@ from .resume_playback import resume_playback
 from .set_shuffle import set_shuffle
 from .set_volume import set_volume
 from .start_playback import start_playback
+from .search import search

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/get_library_albums.py

@@ -0,0 +1,18 @@
+from .presenters.albums_presenter import AlbumsPresenter
+
+def get_library_albums(spotipy_client):
+    albums = []
+    limit = 50
+    offset = 0
+
+    while True:
+        results = spotipy_client.current_user_saved_albums(limit=limit, offset=offset)
+        raw_albums = list(map(lambda item: item['album'], results['items']))
+
+        albums += AlbumsPresenter(raw_albums).format()
+
+        offset += limit
+        if len(results['items']) < limit:
+            break
+
+    return {'albums': albums}

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/get_library_playlists.py

@@ -0,0 +1,16 @@
+from .presenters.playlists_presenter import PlaylistsPresenter
+
+def get_library_playlists(spotipy_client):
+    playlists = []
+    limit = 50
+    offset = 0
+
+    while True:
+        results = spotipy_client.current_user_playlists(limit=limit, offset=offset)
+        playlists += PlaylistsPresenter(results['items']).format()
+
+        offset += limit
+        if len(results['items']) < limit:
+            break
+
+    return {'playlists': playlists}

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/__init__.py

@@ -0,0 +1,7 @@
+from .collection_presenter import CollectionPresenter
+from .albums_presenter import AlbumsPresenter
+from .artists_presenter import ArtistsPresenter
+from .playlists_presenter import PlaylistsPresenter
+from .tracks_presenter import TracksPresenter
+from .shows_presenter import ShowsPresenter
+from .episodes_presenter import EpisodesPresenter

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/albums_presenter.py

@@ -0,0 +1,14 @@
+from .collection_presenter import CollectionPresenter
+
+class AlbumsPresenter(CollectionPresenter):
+    def format(self):
+        albums = []
+
+        for item in self.items:
+            album_info = super().format_item(item)
+            album_info.update({
+                'artists': ', '.join([artist['name'] for artist in item['artists']]),
+                'name': item['name']
+            })
+            albums.append(album_info)
+        return albums

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/artists_presenter.py

@@ -0,0 +1,14 @@
+from .collection_presenter import CollectionPresenter
+
+class ArtistsPresenter(CollectionPresenter):
+    def format(self):
+        artists = []
+
+        for item in self.items:
+            artist_info = super().format_item(item)
+            artist_info.update({
+                'name': item['name'],
+                'followers': item['followers']['total']
+            })
+            artists.append(artist_info)
+        return artists

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/collection_presenter.py

@@ -0,0 +1,12 @@
+class CollectionPresenter:
+    def __init__(self, items):
+        self.items = items
+        print(items)
+    def format_item(self, item):
+        return {
+            'spotify_id': item['id'],
+            'type': self.get_type()
+        }
+
+    def get_type(self):
+        return self.__class__.__name__.replace('Presenter', '').lower()

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/episodes_presenter.py

@@ -0,0 +1,14 @@
+from .collection_presenter import CollectionPresenter
+
+class EpisodesPresenter(CollectionPresenter):
+    def format(self):
+        episodes = []
+
+        for item in self.items:
+            episode_info = super().format_item(item)
+            episode_info.update({
+                'name': item['name'],
+                'description': item['description']
+            })
+            episodes.append(episode_info)
+        return episodes

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/playlists_presenter.py

@@ -0,0 +1,14 @@
+from .collection_presenter import CollectionPresenter
+
+class PlaylistsPresenter(CollectionPresenter):
+    def format(self):
+        playlists = []
+
+        for item in self.items:
+            playlist_info = super().format_item(item)
+            playlist_info.update({
+                'owner': item['owner']['display_name'],
+                'name': item['name']
+            })
+            playlists.append(playlist_info)
+        return playlists

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/shows_presenter.py

@@ -0,0 +1,14 @@
+from .collection_presenter import CollectionPresenter
+
+class ShowsPresenter(CollectionPresenter):
+    def format(self):
+        shows = []
+
+        for item in self.items:
+            show_info = super().format_item(item)
+            show_info.update({
+                'name': item['name'],
+                'description': item['description']
+            })
+            shows.append(show_info)
+        return shows

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/presenters/tracks_presenter.py

@@ -0,0 +1,14 @@
+from .collection_presenter import CollectionPresenter
+
+class TracksPresenter(CollectionPresenter):
+    def format(self):
+        tracks = []
+
+        for item in self.items:
+            track_info = super().format_item(item)
+            track_info.update({
+                'artists': ', '.join([artist['name'] for artist in item['artists']]),
+                'name': item['name']
+            })
+            tracks.append(track_info)
+        return tracks

spotify-cmd-0.1.4/src/spotify_cmd_daemon/operations/search.py

@@ -0,0 +1,22 @@
+from .presenters import *
+
+def search(spotipy_client, search_query, resource_type):
+    response = spotipy_client.search(q=search_query, type=resource_type)
+    collection_key = next(iter(response.keys()))
+    items = response[collection_key].get('items', [])
+    result = None
+
+    if resource_type == 'album':
+        result = AlbumsPresenter(items).format()
+    elif resource_type == 'artist':
+        result = ArtistsPresenter(items).format()
+    elif resource_type == 'playlist':
+        result = PlaylistsPresenter(items).format()
+    elif resource_type == 'track':
+        result = TracksPresenter(items).format()
+    elif resource_type == 'show':
+        result = ShowsPresenter(items).format()
+    elif resource_type == 'episode':
+        result = EpisodesPresenter(items).format()
+
+    return { f"{resource_type}s": result }

{spotify-cmd-0.1.2 → spotify-cmd-0.1.4}/src/spotify_cmd_daemon/spotify_controller.py

@@ -49,6 +49,8 @@ class SpotifyController:
                 self.handle_set(command_data)
             elif command == 'get':
                 self.handle_get(command_data)
+            elif command == 'find':
+                self.handle_search(command_data)
         except SpotifyException as e:
             print(f"Spotify error: {e}")
             self.response = {"error": str(e)}
@@ -56,6 +58,13 @@ class SpotifyController:
             print(f"Error: {e}")
             self.response = {"error": str(e)}
 
+    def handle_search(self, command_data):
+        type = command_data.get('type')
+        search_query = command_data.get('value')
+
+        self.response = operations.search(self.spotipy_client, search_query, type)
+
+
     def handle_play(self, command_data):
         type = command_data.get('type')
 

spotify-cmd-0.1.2/src/spotify_cmd_daemon/operations/get_library_albums.py

@@ -1,22 +0,0 @@
-def get_library_albums(spotipy_client):
-    albums = []
-    limit = 50
-    offset = 0
-
-    while True:
-        results = spotipy_client.current_user_saved_albums(limit=limit, offset=offset)
-        for item in results['items']:
-            album = item['album']
-            album_info = {
-                'spotify_id': album['id'],
-                'type': 'album',
-                'artists': ', '.join([artist['name'] for artist in album['artists']]),
-                'name': album['name']
-            }
-            albums.append(album_info)
-
-        offset += limit
-        if len(results['items']) < limit:
-            break
-
-    return { 'albums': albums }

spotify-cmd-0.1.2/src/spotify_cmd_daemon/operations/get_library_playlists.py

@@ -1,21 +0,0 @@
-def get_library_playlists(spotipy_client):
-    playlists = []
-    limit = 50
-    offset = 0
-
-    while True:
-        results = spotipy_client.current_user_playlists(limit=limit, offset=offset)
-        for item in results['items']:
-            playlist_info = {
-                'spotify_id': item['id'],
-                'type': 'playlist',
-                'owner': item['owner']['display_name'],
-                'name': item['name']
-            }
-            playlists.append(playlist_info)
-
-        offset += limit
-        if len(results['items']) < limit:
-            break
-
-    return { 'playlists': playlists }