Merge 12f10b6 into 422835e

natumbri · Apr 2, 2019 · a649285 · a649285
2 parents 422835e + 12f10b6
commit a649285
Show file tree

Hide file tree

Showing 16 changed files with 928 additions and 2,276 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,3 +8,6 @@ MANIFEST
 build/
 dist/
 xunit-*.xml
+mopidy-youtube.Rproj
+.Rproj.user/
+.Rhistory
diff --git a/.travis.yml b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 language: python
 
@@ -16,6 +16,7 @@ before_install:
 
 install:
   - "pip install tox"
+  - "sudo -H pip install youtube-dl"
 
 script:
   - "tox -e $TOX_ENV"

diff --git a/README.rst b/README.rst
@@ -59,8 +59,15 @@ Install by running::
 Configuration
 =============
 
-No configuration needed. The only supported config value is ``youtube/enabled``
-which can be set to ``false`` to disable the extension.
+Before starting Mopidy, you must add your Google API key
+to your Mopidy configuration file::
+
+    [youtube]
+    enabled = true
+    search_results = 15
+    playlist_max_videos = 20
+    youtube_api_key = <api key you got from Google>
+    threads_max = 2
 
 
 Usage

diff --git a/mopidy_youtube/__init__.py b/mopidy_youtube/__init__.py
@@ -23,6 +23,10 @@ def get_default_config(self):
 
     def get_config_schema(self):
         schema = super(Extension, self).get_config_schema()
+        schema['search_results'] = config.Integer()
+        schema['playlist_max_videos'] = config.Integer()
+        schema['youtube_api_key'] = config.String()
+        schema['threads_max'] = config.Integer()
         return schema
 
     def setup(self, registry):