diff --git a/README.md b/README.md index 9be6c4a..4536e42 100644 --- a/README.md +++ b/README.md @@ -152,8 +152,7 @@ example of what it looks like: WSGIApplicationGroup %{GLOBAL} WSGIPassAuthorization On - Order deny,allow - Allow from all + Require all granted You might also need to run _Apache_ using the system default locale, as the one diff --git a/setup.py b/setup.py index ca97a79..3b46027 100755 --- a/setup.py +++ b/setup.py @@ -37,7 +37,7 @@ setup( author_email=project.AUTHOR_EMAIL, url=project.URL, license=project.LICENSE, - packages=find_packages(), + packages=find_packages(exclude=['tests*']), install_requires = reqs, extras_require = extras, scripts=['bin/supysonic-cli', 'bin/supysonic-watcher'], diff --git a/supysonic/config.py b/supysonic/config.py index 0e602b8..f82487c 100644 --- a/supysonic/config.py +++ b/supysonic/config.py @@ -18,7 +18,6 @@ import tempfile class DefaultConfig(object): DEBUG = False - SECRET_KEY = os.urandom(128) tempdir = os.path.join(tempfile.gettempdir(), 'supysonic') BASE = { diff --git a/supysonic/templates/profile.html b/supysonic/templates/profile.html index 4dc3cab..0713853 100644 --- a/supysonic/templates/profile.html +++ b/supysonic/templates/profile.html @@ -93,10 +93,18 @@

Clients

Here's a list of clients you used to stream music. If you want to use -transcoding or downsampling with one of them (for instance using a low -bitrate on mobile connections to reduce used bandwidth), but the client -doesn't provide options to do so, you can set default values here. They'll -only be used if no transcoding/downsampling is requested by the client.

+transcoding or downsampling with one of them (for instance using a low bitrate +on mobile connections to reduce used bandwidth), but the client doesn't provide +options to do so, you can set default values here. They'll only be used if no +transcoding/downsampling is requested by the client.
+The first field is used to specify the format all files will be converted to. It +means if you enter mp3, all media will be served as mp3, wether the +original file is a mp3, ogg, FLAC or whatever. The bitrate option specify the +maximum streaming bitrate. If a file has a higher bitrate it will be transcoded +to match this value. Note that either the format or bitrate field can be left +out, for instance you can only enter a bitrate so files will be streamed using +their original format, only transcoded if their bitrate exceed the selected +one.

@@ -106,7 +114,9 @@ only be used if no transcoding/downsampling is requested by the client.

{% for client in clients %} - +