Add configuration menu, allow merging external sources

README.md

@@ -15,6 +15,7 @@ More information and documentation for developers can be found on our [Wiki page
 
 ## Features
 * Integrates Live TV Channels with EPG data in Kodi from supported IPTV Add-ons
+* Supports external sources so you can specify your own `M3U` and `XMLTV` files to merge from a file or a http(s)://-url
 * Allows playback of past and future programs directly from the EPG
 
 ## Screenshots

addon.xml

@@ -3,17 +3,17 @@
     <requires>
         <import addon="xbmc.python" version="2.26.0"/>
         <import addon="script.module.dateutil" version="2.6.0"/>
+        <import addon="script.module.requests" version="2.22.0"/>
+        <import addon="script.module.routing" version="0.2.0"/>
         <import addon="pvr.iptvsimple" version="3.8.8"/>
     </requires>
-    <!-- This is needed to get an add-on icon -->
-    <extension point="xbmc.python.script" library="default.py">
+    <extension point="xbmc.python.pluginsource" library="addon_entry.py">
         <provides>executable</provides>
     </extension>
-    <extension point="xbmc.service" library="service.py"/>
-    <extension point="xbmc.python.library" library="default.py"/>
+    <extension point="xbmc.service" library="service_entry.py"/>
     <extension point="kodi.context.item">
         <menu id="kodi.core.main">
-            <item library="context.py">
+            <item library="context_entry.py">
                 <label>30600</label>
                 <visible>String.StartsWith(System.BuildVersion,18) + Window.IsVisible(tvguide) | Window.IsVisible(tvsearch)</visible>
             </item>

addon_entry.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+"""Addon entry point"""
+
+from __future__ import absolute_import, division, unicode_literals
+
+from xbmcaddon import Addon
+
+from resources.lib import kodiutils, kodilogging
+
+# Reinitialise ADDON every invocation to fix an issue that settings are not fresh.
+kodiutils.ADDON = Addon()
+kodilogging.ADDON = Addon()
+
+if __name__ == '__main__':
+    from sys import argv
+    from resources.lib.addon import run
+
+    run(argv)

context.py → context_entry.py

@@ -3,6 +3,7 @@
 
 from __future__ import absolute_import, division, unicode_literals
 
-from resources.lib.functions import run
+if __name__ == '__main__':
+    from resources.lib.addon import run
 
-run([-1, 'play_from_contextmenu'])
+    run(['/play'])

requirements.txt

@@ -6,4 +6,7 @@ pytest-cov
 pytest-timeout
 python-dateutil
 mock
+responses
+requests
+git+git://github.com/dagwieers/kodi-plugin-routing.git@setup#egg=routing
 sakee

resources/language/resource.language.el_gr/strings.po

@@ -8,6 +8,95 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+# MENU
+msgctxt "#30001"
+msgid "Configure IPTV Simple automatically"
+msgstr "Ρύθμιση του IPTV Simple αυτομάτως"
+
+msgctxt "#30002"
+msgid "Refresh channels and guide now"
+msgstr "Ανανέωση καναλιών και οδηγού τώρα"
+
+msgctxt "#30003"
+msgid "IPTV Manager Settings"
+msgstr ""
+
+msgctxt "#30004"
+msgid "Manage Sources"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Sources"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Supported Add-ons"
+msgstr ""
+
+msgctxt "#30012"
+msgid "External Sources"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Add external source…"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Delete Source"
+msgstr ""
+
+msgctxt "#30020"
+msgid "Name"
+msgstr ""
+
+msgctxt "#30021"
+msgid "Modify the name of this source."
+msgstr ""
+
+msgctxt "#30022"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "#30023"
+msgid "Enable or disable this source."
+msgstr ""
+
+msgctxt "#30024"
+msgid "Yes"
+msgstr ""
+
+msgctxt "#30025"
+msgid "No"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Playlist"
+msgstr ""
+
+msgctxt "#30027"
+msgid "Select the channel data in M3U format for this source."
+msgstr ""
+
+msgctxt "#30028"
+msgid "EPG"
+msgstr ""
+
+msgctxt "#30029"
+msgid "Select the EPG data in XMLTV format for this source."
+msgstr ""
+
+msgctxt "#30030"
+msgid "Enter URL…"
+msgstr ""
+
+msgctxt "#30031"
+msgid "Browse for file…"
+msgstr ""
+
+msgctxt "#30032"
+msgid "None"
+msgstr ""
+
 # CONTEXT MENU
 msgctxt "#30600"
 msgid "Play with IPTV Manager"

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

@@ -8,11 +8,102 @@ msgstr ""
 "Language: en\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+# MENU
+msgctxt "#30001"
+msgid "Configure IPTV Simple automatically"
+msgstr ""
+
+msgctxt "#30002"
+msgid "Refresh channels and guide now"
+msgstr ""
+
+msgctxt "#30003"
+msgid "IPTV Manager Settings"
+msgstr ""
+
+msgctxt "#30004"
+msgid "Manage Sources"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Sources"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Supported Add-ons"
+msgstr ""
+
+msgctxt "#30012"
+msgid "External Sources"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Add external source…"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Delete Source"
+msgstr ""
+
+msgctxt "#30020"
+msgid "Name"
+msgstr ""
+
+msgctxt "#30021"
+msgid "Modify the name of this source."
+msgstr ""
+
+msgctxt "#30022"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "#30023"
+msgid "Enable or disable this source."
+msgstr ""
+
+msgctxt "#30024"
+msgid "Yes"
+msgstr ""
+
+msgctxt "#30025"
+msgid "No"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Playlist"
+msgstr ""
+
+msgctxt "#30027"
+msgid "Select the channel data in M3U format for this source."
+msgstr ""
+
+msgctxt "#30028"
+msgid "EPG"
+msgstr ""
+
+msgctxt "#30029"
+msgid "Select the EPG data in XMLTV format for this source."
+msgstr ""
+
+msgctxt "#30030"
+msgid "Enter URL…"
+msgstr ""
+
+msgctxt "#30031"
+msgid "Browse for file…"
+msgstr ""
+
+msgctxt "#30032"
+msgid "None"
+msgstr ""
+
+
 # CONTEXT MENU
 msgctxt "#30600"
 msgid "Play with IPTV Manager"
 msgstr ""
 
+
 # MESSAGES
 msgctxt "#30700"
 msgid "Are you sure you want to setup IPTV Simple for the use with IPTV Manager? Any existing configuration of IPTV Simple will be overwritten."
@@ -42,6 +133,7 @@ msgctxt "#30706"
 msgid "This program isn't available to play."
 msgstr ""
 
+
 # SETTINGS
 msgctxt "#30800"
 msgid "Channels"
@@ -97,4 +189,4 @@ msgstr ""
 
 msgctxt "#30884"
 msgid "Open Kodi Logfile Uploader…"
-msgstr ""
+msgstr ""

resources/language/resource.language.hu_hu/strings.po

@@ -8,6 +8,95 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+# MENU
+msgctxt "#30001"
+msgid "Configure IPTV Simple automatically"
+msgstr "IPTV Simple automatikus konfigurációja"
+
+msgctxt "#30002"
+msgid "Refresh channels and guide now"
+msgstr "Csatornák és műsorújság frissítése most"
+
+msgctxt "#30003"
+msgid "IPTV Manager Settings"
+msgstr ""
+
+msgctxt "#30004"
+msgid "Manage Sources"
+msgstr ""
+
+msgctxt "#30010"
+msgid "Sources"
+msgstr ""
+
+msgctxt "#30011"
+msgid "Supported Add-ons"
+msgstr ""
+
+msgctxt "#30012"
+msgid "External Sources"
+msgstr ""
+
+msgctxt "#30013"
+msgid "Add external source…"
+msgstr ""
+
+msgctxt "#30014"
+msgid "Delete Source"
+msgstr ""
+
+msgctxt "#30020"
+msgid "Name"
+msgstr ""
+
+msgctxt "#30021"
+msgid "Modify the name of this source."
+msgstr ""
+
+msgctxt "#30022"
+msgid "Enabled"
+msgstr ""
+
+msgctxt "#30023"
+msgid "Enable or disable this source."
+msgstr ""
+
+msgctxt "#30024"
+msgid "Yes"
+msgstr ""
+
+msgctxt "#30025"
+msgid "No"
+msgstr ""
+
+msgctxt "#30026"
+msgid "Playlist"
+msgstr ""
+
+msgctxt "#30027"
+msgid "Select the channel data in M3U format for this source."
+msgstr ""
+
+msgctxt "#30028"
+msgid "EPG"
+msgstr ""
+
+msgctxt "#30029"
+msgid "Select the EPG data in XMLTV format for this source."
+msgstr ""
+
+msgctxt "#30030"
+msgid "Enter URL…"
+msgstr ""
+
+msgctxt "#30031"
+msgid "Browse for file…"
+msgstr ""
+
+msgctxt "#30032"
+msgid "None"
+msgstr ""
+
 # CONTEXT MENU
 msgctxt "#30600"
 msgid "Play with IPTV Manager"