added pypi package and other stuff :)

Author: Blatzar

.gitignore

@@ -0,0 +1,88 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# dotenv
+.env
+
+# virtualenv
+.venv
+venv/
+ENV/

__init__.py

@@ -0,0 +1 @@
+from . import autoskip

autoskip/__init__.py

@@ -0,0 +1 @@
+from . import cli

autoskip/__version__.py

@@ -0,0 +1 @@
+__version__ = '1.0.0'

main.py renamed to autoskip/autoskipper.py

@@ -4,14 +4,12 @@
 import dbus
 import asyncio
 import os
-import sys
+import signal
 import time
 import json
 import threading
 from colorama import Fore, Back, Style  # Colors in terminal
 
-loop = asyncio.get_event_loop()
-
 DBusGMainLoop(set_as_default=True)
 
 
@@ -60,8 +58,6 @@ def create(self, artist):
         return self.artists[artist]
 
     def write(self):
-        # Cleanup
-        print(self.artists)
         # fixed_artists = {i: self.artists[i] for i in self.artists if self.artists[i] != self.default}
         with open(self.file, "w") as f:
             json.dump(self.artists, f, indent=4)
@@ -89,9 +85,10 @@ def do_nothing(*args, **kwargs):
 
 
 def skip():
+    print(Fore.RED + 'Skipped!' + Style.RESET_ALL, end=' ')
     get_info = dbus.SessionBus()
     spotify_bus = get_info.get_object("org.mpris.MediaPlayer2.spotify", "/org/mpris/MediaPlayer2")
-    # status = spotify_bus.Get('org.mpris.MediaPlayer2.Player', 'PlaybackStatus', dbus_interface='org.freedesktop.DBus.Properties')
+    status = spotify_bus.Get('org.mpris.MediaPlayer2.Player', 'PlaybackStatus', dbus_interface='org.freedesktop.DBus.Properties')
     spotify_bus.Next(dbus_interface='org.mpris.MediaPlayer2.Player', reply_handler=do_nothing, error_handler=do_nothing)
 
 
@@ -135,67 +132,82 @@ def song_print(song):
         skip()
 
 
-def command_handler(command):
+def toggle():
     config = Config()
+
+    if config.autoskip:
+        print(Fore.RED + 'Autoskip disabled' + Style.RESET_ALL, end=' ')
+    else:
+        print(Fore.GREEN + 'Autoskip enabled' + Style.RESET_ALL, end=' ')
+    config.autoskip = not config.autoskip
+    config.write()
+
+
+def bls():
     song = Song()
     song_config = SongConfig()
 
-    def toggle():
-        if config.autoskip:
-            print(Fore.RED + 'Autoskip disabled' + Style.RESET_ALL, end=' ')
-        else:
-            print(Fore.GREEN + 'Autoskip enabled' + Style.RESET_ALL, end=' ')
-        config.autoskip = not config.autoskip
-        config.write()
-
-    def bls():
-        current_song = song_config.create(song.artist)
-        if song.title in current_song["blacklisted_songs"]:
-            current_song["blacklisted_songs"].remove(song.title)
-            text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.title}" from blacklisted songs'
-        else:
-            current_song["blacklisted_songs"].append(song.title)
-            text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to blacklisted songs'
-            skip()
+    current_song = song_config.create(song.artist)
+    if song.title in current_song["blacklisted_songs"]:
+        current_song["blacklisted_songs"].remove(song.title)
+        text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.title}" from blacklisted songs'
+    else:
+        current_song["blacklisted_songs"].append(song.title)
+        text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to blacklisted songs'
+        skip()
 
-        print(text, end=' ')
-        song_config.write()
+    print(text, end=' ')
+    song_config.write()
 
-    def bla():
-        current_song = song_config.create(song.artist)
-        if current_song["blacklisted"]:
-            text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.artist}" from blacklisted artists'
-        else:
-            text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to blacklisted artists'
-            skip()
-
-        current_song["blacklisted"] = not current_song["blacklisted"]
-        print(text, end=' ')
-        song_config.write()
-
-    def wls():
-        current_song = song_config.create(song.artist)
-        if song.title in current_song["whitelisted_songs"]:
-            current_song["whitelisted_songs"].remove(song.title)
-            text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.title}" from whitelisted songs'
-        else:
-            current_song["whitelisted_songs"].append(song.title)
-            text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to whitelisted songs'
 
-        print(text, end=' ')
-        song_config.write()
+def bla():
+    song = Song()
+    song_config = SongConfig()
+
+    current_song = song_config.create(song.artist)
+    if current_song["blacklisted"]:
+        text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.artist}" from blacklisted artists'
+    else:
+        text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to blacklisted artists'
+        skip()
 
-    def wla():
-        current_song = song_config.create(song.artist)
-        if current_song["whitelisted"]:
-            text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.artist}" from whitelisted artists'
-        else:
-            text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to whitelisted artists'
+    current_song["blacklisted"] = not current_song["blacklisted"]
+    print(text, end=' ')
+    song_config.write()
 
-        current_song["whitelisted"] = not current_song["whitelisted"]
-        print(text, end=' ')
-        song_config.write()
 
+def wls():
+    song = Song()
+    song_config = SongConfig()
+
+    current_song = song_config.create(song.artist)
+    if song.title in current_song["whitelisted_songs"]:
+        current_song["whitelisted_songs"].remove(song.title)
+        text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.title}" from whitelisted songs'
+    else:
+        current_song["whitelisted_songs"].append(song.title)
+        text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to whitelisted songs'
+
+    print(text, end=' ')
+    song_config.write()
+
+
+def wla():
+    song = Song()
+    song_config = SongConfig()
+
+    current_song = song_config.create(song.artist)
+    if current_song["whitelisted"]:
+        text = f'{Fore.RED}Removed{Style.RESET_ALL} "{song.artist}" from whitelisted artists'
+    else:
+        text = f'{Fore.GREEN}Added{Style.RESET_ALL} "{song.title}" to whitelisted artists'
+
+    current_song["whitelisted"] = not current_song["whitelisted"]
+    print(text, end=' ')
+    song_config.write()
+
+
+def command_handler(command):
     commands = {
         't': toggle,
         'toggle': toggle,
@@ -212,13 +224,20 @@ def wla():
 
 
 class InputThread(threading.Thread):
+    def signal_handler(sig, frame):
+        # print('\nExiting')
+        os._exit(1)
+
+    # Ctrl + C
+    signal.signal(signal.SIGINT, signal_handler)
+
     def run(self):
         while True:
             command = input()
             command_handler(command.split(' '))
 
 
-async def main():
+async def main(loop):
     # Bad but necessary to prevent rerunning on the same song.
     global past_song
     config = Config()
@@ -260,12 +279,21 @@ def on_properties_changed(interface_name, changed_properties, invalidated_proper
                 score = variant.value["xesam:autoRating"].value
                 song = Song(title, artist, score)
                 # Comparing objects doesn't work so it compares the dict.
-                if song.__dict__ != past_song.__dict__:
+                # != (" ", " ", " ") to prevent skipping when spotify is used on another device and
+                # metadata cannot be extrected.
+                if song.__dict__ != past_song.__dict__ and (title, artist, score) != (" ", " ", " "):
                     past_song = song
                     song_print(song)
 
     properties.on_properties_changed(on_properties_changed)
     await loop.create_future()
+    input_thread.join()
+
+
+def run():
+    loop = asyncio.get_event_loop()
+    loop.run_until_complete(main(loop))
+
 
-loop.run_until_complete(main())
-input_thread.join()
+if __name__ == "__main__":
+    run()

autoskip/cli.py

@@ -0,0 +1,43 @@
+#!/usr/bin/env python3
+from . import autoskipper
+import argparse
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--toggle', '-t', action='store_const', const=True, help='Toggle autoskipper')
+    parser.add_argument('--skip', '-s', action='store_const', const=True, help='Skip song')
+    parser.add_argument('--whitelist-song', '-wls', action='store_const', const=True, help='Toggle whitelist for current song')
+    parser.add_argument('--whitelist-artist', '-wla', action='store_const', const=True, help='Toggle whitelist for current artist')
+    parser.add_argument('--blacklist-song', '-bls', action='store_const', const=True, help='Toggle blacklist for current song')
+    parser.add_argument('--blacklist-artist', '-bla', action='store_const', const=True, help='Toggle blacklist for current artist')
+    parser.add_argument('--run', '-r', action='store_const', const=True, help='Run CLI')
+    args = parser.parse_args()
+
+    # Could be done with dict, but this is easily read.
+    if args.whitelist_artist:
+        autoskipper.wla()
+
+    if args.blacklist_artist:
+        autoskipper.bla()
+
+    if args.whitelist_song:
+        autoskipper.wls()
+
+    if args.blacklist_song:
+        autoskipper.bls()
+
+    if args.skip:
+        autoskipper.skip()
+
+    if args.toggle:
+        autoskipper.toggle()
+
+    # Makes a dict of all args used. Checked in order to determine if the program should be run.
+    fixed_args = {i: args.__dict__[i] for i in args.__dict__ if args.__dict__[i] is not None}
+    if not fixed_args or args.run:
+        autoskipper.run()
+
+
+if __name__ == "__main__":
+    main()

setup.py

@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+from setuptools import setup, find_packages
+import re
+import io
+
+with open('README.md', 'r') as f:
+    long_description = f.read()
+
+with io.open('autoskip/__version__.py', 'rt', encoding='utf8') as f:
+    version = re.search(r'__version__ = \'(.*?)\'', f.read()).group(1)
+
+setup(
+    name='spotify-skipper',
+    version=version,
+    author='Blatzar',
+    author_email='blatzar@gmail.com',
+    description='Blacklist artists and songs, no login needed.',
+    packages=find_packages(),
+    url='https://github.com/Blatzar/spotify-skipper',
+    keywords=['spotify', 'skip'],
+    install_requires=[
+        'colorama',
+        'dbus-python',
+        'dbus_next',
+        'asyncio',
+        'argparse'
+    ],
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    entry_points={
+        'console_scripts': ['autoskip=autoskip.cli:main'],
+    }
+)