more code cleanup
authorMarcel van der Veldt <m.vanderveldt@outlook.com>
Thu, 16 Apr 2020 08:40:34 +0000 (10:40 +0200)
committerMarcel van der Veldt <m.vanderveldt@outlook.com>
Thu, 16 Apr 2020 08:40:34 +0000 (10:40 +0200)
music_assistant/musicproviders/file.py
music_assistant/musicproviders/qobuz.py
music_assistant/musicproviders/spotify.py
music_assistant/musicproviders/tunein.py
setup.py

index a72c4e64e5ed981f1fe45459b4a60101d3218324..9d23d1b30fe2cb5fa5b9a5d7fe5571390f77a8bf 100644 (file)
@@ -1,17 +1,11 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-
-import asyncio
+"""Filesystem musicprovider support for MusicAssistant."""
 import base64
 import os
-import sys
-import time
 from typing import List
 
 from music_assistant.constants import CONF_ENABLED
 from music_assistant.models.media_types import (
     Album,
-    AlbumType,
     Artist,
     MediaType,
     Playlist,
index 6393ab9ca6323de769b0fc7c4eed7b7cc6c3ae2a..588545f01a7ed730cd3425077f88220d6e1bc10a 100644 (file)
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-
+"""Qobuz musicprovider support for MusicAssistant."""
 import datetime
 import hashlib
 import time
index e56b3f01b41fc9039002243e9c0f4abb48b17ecd..d447d47abcd484764f8be16c383fb2aec3bf4664 100644 (file)
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-
+"""Spotify musicprovider support for MusicAssistant."""
 import asyncio
 import os
 import platform
index ef07ba5ac47c0ef6688131a1bd44035814e2ff68..1d6efaacbcc2909af86231857058e6c7e25560f0 100644 (file)
@@ -1,6 +1,4 @@
-#!/usr/bin/env python3
-# -*- coding:utf-8 -*-
-
+"""Tunein musicprovider support for MusicAssistant."""
 from typing import List
 
 import aiohttp
index d8a91f60adf0047df60806899831f8d1c3339c97..86ffd28032299df4bd69fd0271ed111af01d3c44 100644 (file)
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
 from pathlib import Path
+import os
 
-from setuptools import find_packages, setup
+from setuptools import setup, glob
 
 PROJECT_DIR = Path(__file__).parent.resolve()
 README_FILE = PROJECT_DIR / "README.md"
@@ -11,6 +12,11 @@ with open("requirements.txt") as f:
 if os.name != "nt":
     INSTALL_REQUIRES.append("uvloop")
 
+DATA_FILES = []
+for directory in glob.glob('music_assistant/'):
+    files = glob.glob(directory+'*')
+    DATA_FILES.append((directory, files))
+
 setup(
     name="music_assistant",
     version=VERSION,
@@ -21,11 +27,12 @@ setup(
     description="Music library manager and player based on sox.",
     long_description=README_FILE.read_text(encoding="utf-8"),
     long_description_content_type="text/markdown",
-    packages=find_packages(exclude=["test.*", "test"]),
+    packages=["music_assistant"],
     python_requires=">=3.7",
     include_package_data=True,
     install_requires=INSTALL_REQUIRES,
     zip_safe=False,
+    data_files=DATA_FILES,
     classifiers=[
         "Development Status :: 4 - Beta",
         "Intended Audience :: Developers",