Automatic country detection/check;prepared for multi-country support;…

…couple of new settings

addon.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.joyn" name="Joyn" version="0.0.4.4" provider-name="knaerzche">
+<addon id="plugin.video.joyn" name="Joyn" version="1.0.0" provider-name="knaerzche">
 	<requires>
 		<import addon="xbmc.python" version="2.1.0"/>
 		<import addon="inputstream.adaptive" version="2.2.21"/>
-		<import addon="script.module.inputstreamhelper" version="0.3.4"/>
+		<import addon="script.module.inputstreamhelper" version="0.3.5"/>
 		<import addon="script.module.uepg" version="1.0.5"/>
 	</requires>
 	<extension point="xbmc.python.pluginsource" library="default.py">
@@ -35,6 +35,12 @@ v0.0.3.2 (03.08.2019)
 v0.0.4.2 (13.08.2019)
 [new] Add Favorites, Last seen, EPG via uEPG, more sort methods for videos, full PY3.7 compat
 [fixed] Season names
+v1.0.0
+[bump] inputstreamhelper version requirement
+[new] automatic country detection; prepare mult-country support
+[new] increase script.module.inputstreamhelper version dependency
+[new] open inputstream.adaptive, uEPG setting from addon settings
+[new] clear cache from addon settings
 		</news>
 	</extension>
 </addon>

changelog.txt

@@ -1,3 +1,4 @@
+
 0.0.2.1
 - Tidy up, fix season images
 0.0.3.0
@@ -11,3 +12,9 @@ v0.0.4.1
  - full PY 3.7 compat
 v0.0.4.2
 - Add sort by date for watchlist
+v1.0.0
+bump inputstreamhelper version requirement
+automatic country detection; prepare mult-country support
+increase script.module.inputstreamhelper version dependency
+open inputstream.adaptive, uEPG setting from addon settings
+clear cache from addon settings

resources/language/resource.language.de_de/strings.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KODI-Addons\n"
 "Report-Msgid-Bugs-To: alanwww1@kodi.org\n"
-"POT-Creation-Date: 2019-08-13 15:51+0000\n"
+"POT-Creation-Date: 2019-08-17 12:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
 "Language-Team: LANGUAGE\n"
@@ -31,15 +31,38 @@ msgid "DRM certificate check"
 msgstr "DRM Zertifikatsprüfung"
 
 msgctxt "#30102"
-msgid "ConfigCache Time (in minutes)"
-msgstr "ConfigCache Zeitraum (in Minuten)"
+msgid "How often to renew config (in minutes)"
+msgstr "Wie oft Konfiguration neu herunterladen (in Minuten)"
 
 msgctxt "#30103"
 msgid "Count of lastseen items"
 msgstr "Anzahl zuletzt gesehen"
 
+msgctxt "#30104"
+msgid "Clear Cache"
+msgstr "Cache leeren"
 
-#empty strings from id 30104 to 30229
+msgctxt "#30105"
+msgid "Country"
+msgstr "Land"
+
+msgctxt "#30106"
+msgid "Detect automatically"
+msgstr "Automatisch erkennen"
+
+msgctxt "#30107"
+msgid "Germany"
+msgstr "Deutschland"
+
+msgctxt "#30108"
+msgid "inputstream settings"
+msgstr "inputstream Einstellungen"
+
+msgctxt "#30109"
+msgid "uEPG settings"
+msgstr "uEPG Einstellungen"
+
+#empty strings from id 30110 to 30229
 # SETTINGS-TITLES
 
 #empty strings from id 30230 to 30349
@@ -56,7 +79,15 @@ msgctxt "#30502"
 msgid "[COLOR orangered]ATTENTION : ... *[/COLOR][COLOR yellow]Widevine[/COLOR][COLOR orangered]* was not found !!![/COLOR][CR]Without Widevine this Addon can not be used !!!"
 msgstr "[COLOR orangered]ACHTUNG : ... *[/COLOR][COLOR yellow]Widevine[/COLOR][COLOR orangered]* wurde nicht gefunden !!![/COLOR][CR]Ohne Widevine kann dieses Addon nicht verwendet werden !!!"
 
-#empty strings from id 30503 to 30520
+msgctxt "#30503"
+msgid "Cancel"
+msgstr "Abbrechen"
+
+msgctxt "#30504"
+msgid "Open addon Settings"
+msgstr "Addon Settings öffnen"
+
+#empty strings from id 30505 to 30520
 # WARNING/INFORMATION-MESSAGES-NOTIFICATION
 
 msgctxt "#30521"
@@ -103,7 +134,15 @@ msgctxt "#30531"
 msgid "Could not access URL {:s}, check your Internet connection"
 msgstr "Konnte nicht auf URL zugreifen: {:s}. Bitte Internetzugang prüfen"
 
-#empty strings from id 30532 to 30600
+msgctxt "#30532"
+msgid "Your coutry could not be automatically detected - please set it in the addon settings"
+msgstr "Land konnte nicht automatisch ermittelt werden - bitte in den Addon Einstellungen setzen"
+
+msgctxt "#30533"
+msgid "It looks like you are located in {:s} - this country is currently not supported by this Joyn addon.[CR]If you are sure, that your are located in an other country, please set it in the addon settings (at your own risk)"
+msgstr "Es scheint, dass Sie in aus {:s} kommen. Dieses Land wird derzeit von Joyn-Addon nicht unterstützt.[CR]Wenn Sie sicher sind, dass Sie aus einem andern Land kommen, bitte in den Addon Einstellungen setzen (auf eigene Gefahr)"
+
+#empty strings from id 30534 to 30600
 # PLUGIN-MAIN and SIDEMENU
 
 msgctxt "#30601"
@@ -214,3 +253,11 @@ msgctxt "#30658"
 msgid "{:s} years and older only"
 msgstr "Ab {:s} Jahren"
 
+msgctxt "#30659"
+msgid "Cache was cleared"
+msgstr "Cache wurde geleert"
+
+msgctxt "#30660"
+msgid "Cache could not be cleared"
+msgstr "Cache konnte nicht geleert werden"
+

resources/language/resource.language.en_gb/strings.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: KODI-Addons\n"
 "Report-Msgid-Bugs-To: alanwww1@kodi.org\n"
-"POT-Creation-Date: 2019-08-13 15:51+0000\n"
+"POT-Creation-Date: 2019-08-17 12:08+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Kodi Translation Team\n"
 "Language-Team: LANGUAGE\n"
@@ -31,14 +31,38 @@ msgid "DRM certificate check"
 msgstr ""
 
 msgctxt "#30102"
-msgid "ConfigCache Time (in minutes)"
+msgid "How often to renew config (in minutes)"
 msgstr ""
 
 msgctxt "#30103"
 msgid "Count of lastseen items"
 msgid ""
 
-#empty strings from id 30104 to 30229
+msgctxt "#30104"
+msgid "Clear cache"
+msgstr ""
+
+msgctxt "#30105"
+msgid "Country"
+msgstr ""
+
+msgctxt "#30106"
+msgid "Detect automatically"
+msgstr ""
+
+msgctxt "#30107"
+msgid "Germany"
+msgstr ""
+
+msgctxt "#30108"
+msgid "inputstream settings"
+msgstr ""
+
+msgctxt "#30109"
+msgid "uEPG settings"
+msgstr ""
+
+#empty strings from id 30110 to 30229
 # SETTINGS-TITLES
 
 #empty strings from id 30230 to 30349
@@ -55,7 +79,15 @@ msgctxt "#30502"
 msgid "[COLOR orangered]ATTENTION : ... *[/COLOR][COLOR yellow]Widevine[/COLOR][COLOR orangered]* was not found !!![/COLOR][CR]Without Widevine this Addon can not be used !!!"
 msgstr ""
 
-#empty strings from id 30503 to 30520
+msgctxt "#30503"
+msgid "Cancel"
+msgstr ""
+
+msgctxt "#30504"
+msgid "Open addon Settings"
+msgstr ""
+
+#empty strings from id 30505 to 30520
 # WARNING/INFORMATION-MESSAGES-NOTIFICATION
 
 msgctxt "#30521"
@@ -102,7 +134,15 @@ msgctxt "#30531"
 msgid "Could not access URL {:s}, check your Internet connection"
 msgstr ""
 
-#empty strings from id 30532 to 30600
+msgctxt "#30532"
+msgid "Your coutry could not be automatically detected - please set it in the addon settings"
+msgstr ""
+
+msgctxt "#30533"
+msgid "It looks like you are located in {:s} - this country is currently not supported by Joyn.[CR]If you are sure, that your are located in an other country, please set it in the addon settings (at your own risk)"
+msgstr ""
+
+#empty strings from id 30534 to 30600
 # PLUGIN-MAIN and SIDEMENU
 
 msgctxt "#30601"
@@ -213,3 +253,11 @@ msgctxt "#30658"
 msgid "{:s} years and older only"
 msgstr ""
 
+msgctxt "#30659"
+msgid "Cache was cleared"
+msgstr ""
+
+msgctxt "#30660"
+msgid "Cache could not be cleared"
+msgstr ""
+

resources/lib/const.py

@@ -7,10 +7,19 @@
 	'PSF_URL'		: 'https://psf.player.v0.maxdome.cloud/dist/playback-source-fetcher.min.js',
 	'MIDDLEWARE_URL'	: 'https://middleware.p7s1.io/joyn/v1/',
 	'ENTITLEMENT_URL'	: 'entitlement-token/anonymous',
+	'IP_API_URL'		: 'http://ip-api.com/json',
+
 	'PSF_VARS_IDX'		: {
 					'SECRET' : 1184
 				  },
 
+	'COUNTRIES'		: {
+					 'DE' : {
+							'language'    : 'de',
+							'setting_id'  : '1',
+						},
+				  },
+
 	'PATH'			: {
 
 					'SEASON'	: {
@@ -52,8 +61,9 @@
 								'SELECTION'	:	'{data{id,channelId,agofCodes,metadata{de}}}',
 								'TEXTS'		:	{'title' : 'main', 'description' : 'seo'},
 								'ART'		:	{'BRAND_LOGO'  : {
-													'icon'   : 'profile:nextgen-web-artlogo-183x75',
-													'thumb'  : 'profile:original',
+													'icon'   	: 'profile:nextgen-web-artlogo-183x75',
+													'thumb'  	: 'profile:original',
+													'clearlogo'	: 'profile:nextgen-web-artlogo-183x75',
 												},
 											},
 							  },
@@ -189,6 +199,12 @@
 					'SEASON_NO'			: 30621,
 					'MSG_CONFIG_VALUES_INCOMPLETE'	: 30530,
 					'MSG_NO_ACCESS_TO_URL'		: 30531,
+					'MSG_COUNTRY_NOT_DETECTED'	: 30532,
+					'MSG_COUNTRY_INVALID'		: 30533,
+					'CANCEL'			: 30503,
+					'OPEN_ADDON_SETTINGS'		: 30504,
+					'CACHE_WAS_CLEARED'		: 30659,
+					'CACHE_COULD_NOT_BE_CLEARED'	: 30660,
 				},
 
 }