Merge pull request #330 from xbmc/develop

Merge Develop to Master

.gitignore

@@ -8,4 +8,5 @@ npm-debug.log
 /tutorial
 atlassian-ide-plugin.xml
 dist/js/build/*
-*.mo
+*.mo
+.vscode

Gruntfile.js

@@ -237,7 +237,7 @@ module.exports = function (grunt) {
           watchTask: true,
           injectChanges: true,
           hostname: "192.168.0.5",
-          proxy: "192.168.0.92:8080",
+          proxy: "192.168.0.10:8080",
           open: false,
           ports: {
             min: 3102,

dist/videoPlayer.html

@@ -120,9 +120,10 @@
             $player = $('<iframe>', {
                 width: width,
                 height: height,
-                src: 'https://www.youtube.com/embed/' + yt  + '?rel=0&amp;showinfo=0&amp;autoplay=1&iv_load_policy=3',
+                src: 'https://www.youtube.com/embed/' + yt  + '?rel=0&amp;showinfo=0&amp;autoplay=1&amp;iv_load_policy=3',
                 frameborder: 0,
-                allowfullscreen: 'allowfullscreen'
+                allowfullscreen: 'allowfullscreen',
+                allow: 'autoplay; encrypted-media'
             });
             $(document).ready(function(){
                $('#switch-player').empty();

src/js/app.coffee

@@ -26,6 +26,10 @@
     showDeviceName: false
     refreshIgnoreNFO: true
     largeBreakpoint: 910
+    apiKeyTMDB: ''
+    apiKeyTVDB: ''
+    apiKeyFanartTv: ''
+    apiKeyYouTube: ''
 }
 
 ## The App Instance

src/js/apps/input/input_app.js.coffee

@@ -86,13 +86,13 @@
 
       ## Respond to key code
       switch e.which
-        when 37 # left
+        when 37, 72 # left, h
           @doInput "Left"
-        when 38 # up
+        when 38, 75 # up, k
           @doInput "Up"
-        when 39 # right
+        when 39, 76 # right, l
           @doInput "Right"
-        when 40 # down
+        when 40, 74 # down, j
           @doInput "Down"
         when 8 # backspace
           @doInput "Back"

src/js/apps/settings/show/local/local_controller.js.coffee

@@ -74,6 +74,15 @@
             {id: 'refreshIgnoreNFO', title: tr("Refresh Ignore NFO"), type: 'checkbox', defaultValue: true, description: tr('Ignore local NFO files when manually refreshing media.')}
           ]
         }
+        {
+          title: 'API Keys'
+          id: 'apikeys'
+          children:[
+            {id: 'apiKeyTMDB', title: tr("The Movie DB"), type: 'textfield', defaultValue: '', description: tr("Set your own TMDB API key.")}
+            {id: 'apiKeyFanartTv', title: tr("FanartTV"), type: 'textfield', defaultValue: '', description: tr("Set your own FanartTv API key.")}
+            {id: 'apiKeyYouTube', title: tr("YouTube"), type: 'textfield', defaultValue: '', description: tr("Set your own YouTube API key.")}
+          ]
+        }
       ]
 
     ## Get settings from local storage

src/js/apps/state/kodi/notifications.js.coffee

@@ -107,6 +107,13 @@
           @setPlaying('playState', 'playing')
           App.execute "player:kodi:timer", 'start'
           @refreshStateNow()
+
+        # playback started
+        when 'Player.OnResume'
+          @setPlaying('paused', false)
+          @setPlaying('playState', 'playing')
+          App.execute "player:kodi:timer", 'start'
+          @refreshStateNow()
 
         # playback stopped
         when 'Player.OnStop'

src/js/entities/external/fanarttv.js.coffee

@@ -3,7 +3,7 @@
   API =
 
     # Using the Kodi API key
-    apiKey: 'ed4b784f97227358b31ca4dd966a04f1'
+    apiKey: 'ZWQ0Yjc4NGY5NzIyNzM1OGIzMWNhNGRkOTY2YTA0ZjE='
 
     # V3 of API
     baseURL: 'http://webservice.fanart.tv/v3/'
@@ -18,7 +18,7 @@
     ## Make a call to API
     call: (path, params, callback) ->
       defaultParams =
-        api_key: @apiKey
+        api_key: config.getAPIKey('apiKeyFanartTv', @apiKey)
       params = _.extend defaultParams, params
       url = @baseURL + path + helpers.url.buildParams(params)
       req = $.getJSON url, (resp) ->

src/js/entities/external/themoviedb.js.coffee

@@ -2,8 +2,8 @@
 
   API =
 
-    # Using the Kodi API key
-    apiKey: 'f7f51775877e0bb6703520952b3c7840'
+    # API Key
+    apiKey: 'NzFiYTFmMDdlZDBmYzhmYjM2MWNmMDRhNThkNzUwNTE='
 
     # V3 of API
     baseURL: 'https://api.themoviedb.org/3/'
@@ -29,7 +29,7 @@
     ## Make a call to API
     call: (path, params, callback) ->
       defaultParams =
-        api_key: @apiKey
+        api_key: config.getAPIKey('apiKeyTMDB', @apiKey)
       params = _.extend defaultParams, params
       url = @baseURL + path + helpers.url.buildParams(params) + '&callback=?'
       $.getJSON url, (resp) ->

src/js/entities/external/youtube.js.coffee

@@ -5,15 +5,15 @@
 
   API =
 
-    apiKey: 'AIzaSyBxvaR6mCnUWN8cv2TiPRmuEh0FykBTAH0'
+    apiKey: 'QUl6YVN5Qnh2YVI2bUNuVVdOOGN2MlRpUFJtdUVoMEZ5a0JUQUgw'
     searchUrl: 'https://www.googleapis.com/youtube/v3/search?part=snippet&type=video&videoDefinition=any&videoEmbeddable=true&order=relevance&safeSearch=none'
     maxResults: 5
 
     kodiUrl: 'plugin://plugin.video.youtube/?action=play_video&videoid='
     ytURL: 'https://youtu.be/'
 
     getSearchUrl: ->
-      @searchUrl + '&key=' + @apiKey
+      @searchUrl + '&key=' + config.getAPIKey('apiKeyYouTube', @apiKey)
 
     parseItems: (response) ->
       items = []

src/js/helpers/config.js.coffee

@@ -29,6 +29,11 @@ config.setLocal = (id, data, callback) ->
 config.setLocalApp = () ->
   config.set 'static', id, data, callback
 
+# A wrapper for getting an API Key.
+config.getAPIKey = (id, defaultData = '') ->
+  key = config.getLocal id, ''
+  return if key is '' then atob(defaultData) else key
+
 # Wrapper for getting a config value before app has started.
 # Should always try and use config.get() before this.
 config.preStartGet = (id, defaultData = '') ->

src/js/helpers/streams.js.coffee

@@ -23,6 +23,11 @@ helpers.stream.videoSizeMap = [
     }
     {
       min: 481
+      max: 576
+      label: '576'
+    }
+    {
+      min: 577
       max: 720
       label: '720p'
     }

src/js/helpers/translate.js.coffee

@@ -13,9 +13,10 @@ helpers.translate.getLanguages = ->
     de: "German"
     lt: "Lithuanian"
     nl: "Dutch"
-    pl: "Polish",
+    pl: "Polish"
     es: "Spanish"
     zh_hans: "Chinese, Simplified"
+    cs: "Czech"
   }
 
 ## Init language and translations.