Merge upstream

addon.xml

@@ -10,6 +10,7 @@
     <import addon="script.module.six" version="1.9.0"/>
     <import addon="script.module.dateutil" version="2.4.0"/>
     <import addon="script.module.pil"/> <!-- TODO? specify version -->
+    <import addon="script.module.inputstreamhelper" version="0.3.3"/>
   </requires>
   <extension point="xbmc.python.pluginsource" library="main.py">
     <provides>video</provides>

resources/language/English/strings.po

@@ -53,6 +53,10 @@ msgctxt "#50010"
 msgid "Use cached thumbnails"
 msgstr ""
 
+msgctxt "#50011"
+msgid "Show additional camera feeds"
+msgstr ""
+
 msgctxt "#50020"
 msgid "Failed to get a video URL. Are you logged in?"
 msgstr ""

resources/language/Hebrew/strings.po

@@ -0,0 +1,77 @@
+# Kodi Media Center language file
+# Addon Name: Skin Widgets
+# Addon id: service.skin.widgets
+# Addon Provider: Martijn|phil65
+msgid ""
+msgstr ""
+"Project-Id-Version: NBA League pass\n"
+"Report-Msgid-Bugs-To: max.galbusera@gmail.com\n"
+"POT-Creation-Date: \n"
+"PO-Revision-Date: 2017-10-30 08:14+0200\n"
+"Last-Translator: A. Dambledore\n"
+"Language-Team: Eng2Heb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: he_IL\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgctxt "#50000"
+msgid "Main settings"
+msgstr "הגדרות ראשיות"
+
+msgctxt "#50001"
+msgid "E-mail"
+msgstr "אי-מייל"
+
+msgctxt "#50002"
+msgid "Password"
+msgstr "סיסמה"
+
+msgctxt "#50003"
+msgid "Video quality"
+msgstr "איכות וידאו מיו-טיוב"
+
+msgctxt "#50004"
+msgid "Show scores"
+msgstr "הצג ניקוד"
+
+msgctxt "#50005"
+msgid "Debug"
+msgstr "איתור באגים"
+
+msgctxt "#50007"
+msgid "Show Live games in local timezone"
+msgstr "הצג משחקים חייםב אזור זמן מקומי"
+
+msgctxt "#50008"
+msgid "next page..."
+msgstr "לעמוד הבא..."
+
+msgctxt "#50009"
+msgid "Favorite team"
+msgstr "נבחרת מועדפת"
+
+msgctxt "#50010"
+msgid "Delete generated thumbnails"
+msgstr "מחק תמונות ממוזערות שנוצרו"
+
+msgctxt "#50020"
+msgid "Failed to get a video URL. Are you logged in?"
+msgstr "נכשל בהשגת כתובת URL לוידאו. האם אתה מחובר?"
+
+msgctxt "#50021"
+msgid "Cannot login: invalid username and password, or your account is locked."
+msgstr "לא מצליח להתחבר: חסר שם משתמש, סיסמה, או שהחשבון שלך ננעל."
+
+msgctxt "#50022"
+msgid "Failed to login (response != 200)"
+msgstr "הכניסה נכשלה (response != 200)"
+
+msgctxt "#50023"
+msgid "Failed to get video URL (response != 200)"
+msgstr "נכשל בהשגת כתובת URL לוידאו. (response != 200)"
+
+msgctxt "#50024"
+msgid "Please fill E-mail and Password in the addon's settings menu"
+msgstr "אנא הכנס אי-מייל וסיסמה בהגדרות ההרחבה."

resources/settings.xml

@@ -13,5 +13,6 @@
 		<setting id="cached_thumbnails" type="bool" label="50010" default="true" />
 		<setting id="debug" type="bool" label="50005" default="false" />
 		<setting id="fanart_image" type="text" label="50006" visible="false" default="" />
+		<setting id="cameras" type="bool" label="50011" default="true" />
 	</category>
 </settings>

src/favteam.py

@@ -3,9 +3,10 @@
 from datetime import timedelta
 import xbmc,xbmcgui
 import traceback
+import calendar
 
 from utils import *
-from common import * 
+from common import *
 import vars
 
 def addFavTeamGameLinks(fromDate, favTeamAbbrs, video_type = 'archive'):
@@ -96,9 +97,24 @@ def addFavTeamGameLinks(fromDate, favTeamAbbrs, video_type = 'archive'):
                         params = {
                             'video_id': game_id,
                             'video_type': video_type,
-                            'video_ishomefeed': 0 if awayFeed else 1
+                            'video_ishomefeed': 0 if awayFeed else 1,
+                            'game_state': gs
                         }
                         name = name + (' (away)' if awayFeed else ' (home)')
+
+                        if 'st' in details:
+                            start_time = calendar.timegm(time.strptime(details['st'], '%Y-%m-%dT%H:%M:%S.%f')) * 1000
+                            params['start_time'] = start_time
+                            if 'et' in details:
+                                end_time = calendar.timegm(time.strptime(details['et'], '%Y-%m-%dT%H:%M:%S.%f')) * 1000
+                                params['end_time'] = end_time
+                                params['duration'] = end_time - start_time
+                            else:
+                                # create my own et for game (now)
+                                end_time = str(datetime.datetime.now()).replace(' ', 'T')
+                                end_time = calendar.timegm(time.strptime(end_time, '%Y-%m-%dT%H:%M:%S.%f')) * 1000
+                                params['end_time'] = end_time
+                                params['duration'] = end_time - start_time
 
                         addListItem(name, url="", mode="playgame", iconimage=thumbnail_url, customparams=params)