X-Git-Url: https://git.cweiske.de/enigma2-curlytx.git/blobdiff_plain/40249155d0d88940c4733bbe22ab80abc88caf13..38752d5f0133b64088b4e70680f8c862f73ebd56:/src/CurlyTx.py diff --git a/src/CurlyTx.py b/src/CurlyTx.py index 85970ca..6ce0efd 100644 --- a/src/CurlyTx.py +++ b/src/CurlyTx.py @@ -1,3 +1,8 @@ +# -*- coding: utf-8 -*- +# CurlyTx main window +# Copyright (C) 2011 Christian Weiske +# License: GPLv3 or later + from . import _ from Screens.Screen import Screen @@ -8,26 +13,31 @@ from Components.ScrollLabel import ScrollLabel from Components.ActionMap import ActionMap from Components.Sources.StaticText import StaticText from twisted.web import client +from twisted.web.client import _makeGetterFactory, HTTPClientFactory +from enigma import gFont from . import config from Components.config import config class CurlyTx(Screen,HelpableScreen): skin = """ - + - - - - - + + + + + """ currentUrl = None currentPage = None + currentFontSize = 20 + httpGetterFactory = None + showingHeaders = False def __init__(self, session, args = None): #self.skin = CurlyTx.skin @@ -44,7 +54,7 @@ class CurlyTx(Screen,HelpableScreen): self["actions"] = ActionMap( - ["WizardActions", "ColorActions", "InputActions"], { + ["WizardActions", "ColorActions", "InputActions", "InfobarEPGActions"], { "ok": self.close, "back": self.close, "up": self.pageUp, @@ -53,11 +63,17 @@ class CurlyTx(Screen,HelpableScreen): "red": self.showSettings, "green": self.reload, "yellow": self.prevPage, - "blue": self.nextPage + "blue": self.nextPage, + + "showEventInfo": self.showHeader }, -1) self.loadHelp() self.loadButtons() + self.onLayoutFinish.append(self.afterLayout) + + def afterLayout(self): + self.setTextFont self.loadUrl(config.plugins.CurlyTx.defaultPage.value) def loadHelp(self): @@ -67,6 +83,9 @@ class CurlyTx(Screen,HelpableScreen): self.helpList.append(( self["actions"], "WizardActions", [("down", _("Scroll page contents down"))])) + self.helpList.append(( + self["actions"], "InfobarEPGActions", + [("showEventInfo", _("Show HTTP response headers"))])) self.helpList.append(( self["actions"], "ColorActions", [("red", _("Show program settings"))])) @@ -139,35 +158,60 @@ class CurlyTx(Screen,HelpableScreen): self.loadNoPage() return + cfg = config.plugins.CurlyTx + pageCount = len(cfg.pages) pageId = int(pageId) - if pageId > (len(config.plugins.CurlyTx.pages) - 1): - if len(config.plugins.CurlyTx.pages) == 0: + if pageId > (pageCount - 1): + if len(cfg.pages) == 0: self.loadNoPage() else: - self["text"].setText("Invalid page " + pageId); + self["text"].setText(_("Invalid page") + " " + pageId); return - url = config.plugins.CurlyTx.pages[pageId].uri.value - title = config.plugins.CurlyTx.pages[pageId].title.value + url = cfg.pages[pageId].uri.value + title = cfg.pages[pageId].title.value + + if pageCount > 1: + title = "{0} [{1}/{2}]".format(title, pageId + 1, pageCount) + self.currentPage = pageId self.currentUrl = url + self.currentFontSize = cfg.pages[pageId].fontSize.value self.setTitle(title) - self["text"].setText("Loading ...\n" + url); + self.setTextFont() + self["text"].setText(_("Loading ...") + "\n" + url); - client.getPage(url).addCallback(self.urlLoaded).addErrback(self.urlFailed, url) + self.getPageWebClient(url).addCallback(self.urlLoaded).addErrback(self.urlFailed, url) + + def setTextFont(self): + if self["text"].long_text is not None: + self["text"].long_text.setFont(gFont("Console", self.currentFontSize)) def urlLoaded(self, html): self["text"].setText(html) def urlFailed(self, error, url): self["text"].setText( - "Error fetching URL:\n " + error.getErrorMessage() + _("Error fetching URL:") + "\n " + error.getErrorMessage() + "\n\nURL: " + url ) def loadNoPage(self): - self["text"].setText("Go and add a page in the settings"); + self["text"].setText(_("Go and add a page in the settings")); + + def showHeader(self): + if self.showingHeaders: + self["text"].setText(self.pageContent) + self.pageContent = None + self.showingHeaders = False + elif self.httpGetterFactory.response_headers: + headers = _("HTTP response headers for") + "\n" + self.currentUrl + "\n\n" + for (k, v) in self.httpGetterFactory.response_headers.items(): + headers += k + ": " + ("\n" + k + ": ").join(v) + "\n" + self.pageContent = self["text"].getText() + self["text"].setText(headers) + self.showingHeaders = True def showSettings(self): from CurlyTxSettings import CurlyTxSettings @@ -181,3 +225,22 @@ class CurlyTx(Screen,HelpableScreen): elif self.currentPage == None: self.currentPage = 0 self.loadUrl(self.currentPage) + + + def getPageWebClient(self, url, contextFactory=None, *args, **kwargs): + """ + Download a web page as a string. + + COPY OF twisted.web.client.getPage to store the factory + + Download a page. Return a deferred, which will callback with a + page (as a string) or errback with a description of the error. + + See L{HTTPClientFactory} to see what extra arguments can be passed. + """ + self.httpGetterFactory = _makeGetterFactory( + url, + HTTPClientFactory, + contextFactory=contextFactory, + *args, **kwargs) + return self.httpGetterFactory.deferred