diff options
Diffstat (limited to 'plugin.video.montreal.greek-tv/resources')
10 files changed, 80 insertions, 123 deletions
diff --git a/plugin.video.montreal.greek-tv/resources/__init__.py b/plugin.video.montreal.greek-tv/resources/__init__.py index d3f5a12..8b13789 100644 --- a/plugin.video.montreal.greek-tv/resources/__init__.py +++ b/plugin.video.montreal.greek-tv/resources/__init__.py @@ -1 +1 @@ -
+ diff --git a/plugin.video.montreal.greek-tv/resources/language/resource.language.el_gr/strings.po b/plugin.video.montreal.greek-tv/resources/language/resource.language.el_gr/strings.po index 2c2212f..e8f6cb5 100644 --- a/plugin.video.montreal.greek-tv/resources/language/resource.language.el_gr/strings.po +++ b/plugin.video.montreal.greek-tv/resources/language/resource.language.el_gr/strings.po @@ -1,40 +1,27 @@ -# Addon Name: Montreal Greek TV
-# Addon id: plugin.video.montreal.greek-tv
-# Addon Provider: Twilight0
-msgid ""
-msgstr ""
-"Project-Id-Version: Montreal Greek TV\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2016-06-22 11:29+0000\n"
-"Last-Translator: twilight0\n"
-"Language-Team: English (http://www.domain.com)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#30001"
-msgid "General"
-msgstr "Γενικά"
-
-msgctxt "#30002"
-msgid "Use old radio stream"
-msgstr "Κάνε χρήση της παλαιάς ροής ραδιοφώνου"
-
-msgctxt "#30003"
-msgid ""
-msgstr ""
-
-msgctxt "#30004"
-msgid ""
-msgstr ""
-
-msgctxt "#30005"
-msgid ""
-msgstr ""
-
-msgctxt "#30006"
-msgid ""
-msgstr ""
-
+# Addon Name: Montreal Greek TV +# Addon id: plugin.video.montreal.greek-tv +# Addon Provider: Twilight0 +msgid "" +msgstr "" +"Project-Id-Version: Montreal Greek TV\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2016-06-22 11:29+0000\n" +"Last-Translator: twilight0\n" +"Language-Team: English (http://www.domain.com)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: el\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#30001" +msgid "Youtube Channel" +msgstr "Κανάλι Youtube" + +msgctxt "#30002" +msgid "ΧΡΟΝΙΚΑ Newspaper" +msgstr "ΧΡΟΝΙΚΑ Newspaper" + +msgctxt "#30003" +msgid "Page" +msgstr "Σελίδα" diff --git a/plugin.video.montreal.greek-tv/resources/language/resource.language.en_gb/strings.po b/plugin.video.montreal.greek-tv/resources/language/resource.language.en_gb/strings.po index 91a20cd..185537c 100644 --- a/plugin.video.montreal.greek-tv/resources/language/resource.language.en_gb/strings.po +++ b/plugin.video.montreal.greek-tv/resources/language/resource.language.en_gb/strings.po @@ -1,39 +1,27 @@ -# Addon Name: Montreal Greek TV
-# Addon id: plugin.video.montreal.greek-tv
-# Addon Provider: Twilight0
-msgid ""
-msgstr ""
-"Project-Id-Version: Montreal Greek TV\n"
-"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"PO-Revision-Date: 2016-06-22 11:29+0000\n"
-"Last-Translator: twilight0\n"
-"Language-Team: English (http://www.domain.com)\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: en\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-
-msgctxt "#30001"
-msgid "General"
-msgstr ""
-
-msgctxt "#30002"
-msgid "Use old radio stream"
-msgstr ""
-
-msgctxt "#30003"
-msgid ""
-msgstr ""
-
-msgctxt "#30004"
-msgid ""
-msgstr ""
-
-msgctxt "#30005"
-msgid ""
-msgstr ""
-
-msgctxt "#30006"
-msgid ""
-msgstr ""
+# Addon Name: Montreal Greek TV +# Addon id: plugin.video.montreal.greek-tv +# Addon Provider: Twilight0 +msgid "" +msgstr "" +"Project-Id-Version: Montreal Greek TV\n" +"POT-Creation-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2016-06-22 11:29+0000\n" +"Last-Translator: twilight0\n" +"Language-Team: English (http://www.domain.com)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +msgctxt "#30001" +msgid "Youtube Channel" +msgstr "" + +msgctxt "#30002" +msgid "ΧΡΟΝΙΚΑ Newspaper" +msgstr "" + +msgctxt "#30003" +msgid "Page" +msgstr "" diff --git a/plugin.video.montreal.greek-tv/resources/lib/__init__.py b/plugin.video.montreal.greek-tv/resources/lib/__init__.py index 96ddb71..12283e0 100644 --- a/plugin.video.montreal.greek-tv/resources/lib/__init__.py +++ b/plugin.video.montreal.greek-tv/resources/lib/__init__.py @@ -25,3 +25,4 @@ syshandle = int(sys.argv[1]) params = dict(urlparse.parse_qsl(sys.argv[2][1:])) action = params.get('action', None) url = params.get('url') +image = params.get('image') diff --git a/plugin.video.montreal.greek-tv/resources/lib/control.py b/plugin.video.montreal.greek-tv/resources/lib/control.py index 3e6a8d7..8a48197 100644 --- a/plugin.video.montreal.greek-tv/resources/lib/control.py +++ b/plugin.video.montreal.greek-tv/resources/lib/control.py @@ -18,9 +18,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. ''' - -import os, xbmc, xbmcaddon, xbmcplugin, xbmcgui, xbmcvfs - +import xbmc, xbmcaddon, xbmcplugin, xbmcgui, xbmcvfs +import os integer = 1000 lang = xbmcaddon.Addon().getLocalizedString @@ -35,6 +34,7 @@ directory = xbmcplugin.endOfDirectory content = xbmcplugin.setContent property = xbmcplugin.setProperty resolve = xbmcplugin.setResolvedUrl +sortmethod = xbmcplugin.addSortMethod infoLabel = xbmc.getInfoLabel condVisibility = xbmc.getCondVisibility @@ -45,6 +45,9 @@ execute = xbmc.executebuiltin skin = xbmc.getSkinDir() player = xbmc.Player() playlist = xbmc.PlayList(xbmc.PLAYLIST_VIDEO) +monitor = xbmc.Monitor() +wait = monitor.waitForAbort +aborted = monitor.abortRequested transPath = xbmc.translatePath skinPath = xbmc.translatePath('special://skin/') @@ -60,6 +63,7 @@ image = xbmcgui.ControlImage alphanum_input = xbmcgui.INPUT_ALPHANUM password_input = xbmcgui.INPUT_PASSWORD hide_input = xbmcgui.ALPHANUM_HIDE_INPUT +verify = xbmcgui.PASSWORD_VERIFY item = xbmcgui.ListItem openFile = xbmcvfs.File @@ -79,9 +83,13 @@ cacheFile = os.path.join(dataPath, 'cache.db') def infoDialog(message, heading=addonInfo('name'), icon='', time=3000): if icon == '': icon = addonInfo('icon') + try: + dialog.notification(heading, message, icon, time, sound=False) + except: + execute("Notification(%s, %s, %s, %s)" % (heading, message, time, icon)) @@ -89,11 +97,7 @@ def okDialog(heading, line1): return dialog.ok(heading, line1) -def inputDialog(heading): - return dialog.input(heading) - - -def yesnoDialog(line1, line2, line3, heading=addonInfo('name'), nolabel='', yeslabel=''): +def yesnoDialog(line1, line2='', line3='', heading=addonInfo('name'), nolabel=None, yeslabel=None): return dialog.yesno(heading, line1, line2, line3, nolabel, yeslabel) @@ -102,28 +106,20 @@ def selectDialog(list, heading=addonInfo('name')): def openSettings(query=None, id=addonInfo('id')): + try: + idle() - execute('Addon.OpenSettings(%s)' % id) + execute('Addon.OpenSettings({0})'.format(id)) if query is None: raise Exception() c, f = query.split('.') execute('SetFocus(%i)' % (int(c) + 100)) execute('SetFocus(%i)' % (int(f) + 200)) - except: - return - -def openSettings_alt(): - try: - idle() - xbmcaddon.Addon().openSettings() except: - return - -def openPlaylist(): - return execute('ActivateWindow(VideoPlaylist)') + return def refresh(): @@ -132,16 +128,3 @@ def refresh(): def idle(): return execute('Dialog.Close(busydialog)') - - -def wait4abort(secs=None): - return xbmc.Monitor().waitForAbort(secs) - - -def set_view_mode(vmid): - return execute('Container.SetViewMode({0})'.format(vmid)) - - -# for compartmentalized theme addons -def addonmedia(icon): - return join(addonPath, 'resources', 'media', icon) diff --git a/plugin.video.montreal.greek-tv/resources/lib/directory.py b/plugin.video.montreal.greek-tv/resources/lib/directory.py index 3ae0b04..eff1fc6 100644 --- a/plugin.video.montreal.greek-tv/resources/lib/directory.py +++ b/plugin.video.montreal.greek-tv/resources/lib/directory.py @@ -23,7 +23,6 @@ import urllib import control - def add(items, cacheToDisc=True, content=None, mediatype=None, infotype='video'): if items is None or len(items) == 0: @@ -127,7 +126,7 @@ def add(items, cacheToDisc=True, content=None, mediatype=None, infotype='video') except: pass - if not content is None: + if content is not None: control.content(int(sys.argv[1]), content) control.directory(int(sys.argv[1]), cacheToDisc=cacheToDisc) diff --git a/plugin.video.montreal.greek-tv/resources/lib/youtube.py b/plugin.video.montreal.greek-tv/resources/lib/youtube.py index ecd7e45..7fd224a 100644 --- a/plugin.video.montreal.greek-tv/resources/lib/youtube.py +++ b/plugin.video.montreal.greek-tv/resources/lib/youtube.py @@ -85,6 +85,7 @@ class youtube(object): return self.list def video_list(self, cid, url, pagination): + try: result = requests.get(url).text result = json.loads(result) @@ -139,8 +140,11 @@ class youtube(object): threads.append(workers.Thread(self.thread, u[i], i)) self.data.append('') - [i.start() for i in threads] - [i.join() for i in threads] + for i in threads: + i.start() + + for i in threads: + i.join() items = [] for i in self.data: @@ -180,6 +184,7 @@ class youtube(object): return self.list def thread(self, url, i): + try: result = requests.get(url).text self.data[i] = result diff --git a/plugin.video.montreal.greek-tv/resources/media/newspaper_fanart.png b/plugin.video.montreal.greek-tv/resources/media/newspaper_fanart.png Binary files differnew file mode 100644 index 0000000..51ba560 --- /dev/null +++ b/plugin.video.montreal.greek-tv/resources/media/newspaper_fanart.png diff --git a/plugin.video.montreal.greek-tv/resources/media/newspaper_icon.png b/plugin.video.montreal.greek-tv/resources/media/newspaper_icon.png Binary files differnew file mode 100644 index 0000000..6c39908 --- /dev/null +++ b/plugin.video.montreal.greek-tv/resources/media/newspaper_icon.png diff --git a/plugin.video.montreal.greek-tv/resources/settings.xml b/plugin.video.montreal.greek-tv/resources/settings.xml deleted file mode 100644 index 8cf2505..0000000 --- a/plugin.video.montreal.greek-tv/resources/settings.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="yes"?> -<settings> - <category label="30001"> - <setting id="old-url" type="bool" label="30002" default="false"/> - </category> -</settings>
\ No newline at end of file |
