git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
follow hotplug-ng changes
[enigma2.git]
/
lib
/
python
/
Plugins
/
Extensions
/
SimpleRSS
/
plugin.py
diff --git
a/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
b/lib/python/Plugins/Extensions/SimpleRSS/plugin.py
index 49da5e632ae86a898d7684273d797389cdc1554b..608d4720df7dafdf250806394bd029e82cecd864 100644
(file)
--- a/
lib/python/Plugins/Extensions/SimpleRSS/plugin.py
+++ b/
lib/python/Plugins/Extensions/SimpleRSS/plugin.py
@@
-5,13
+5,10
@@
from Screens.Screen import Screen
from Screens.MessageBox import MessageBox
from Components.ActionMap import ActionMap
from Components.GUIComponent import GUIComponent
from Screens.MessageBox import MessageBox
from Components.ActionMap import ActionMap
from Components.GUIComponent import GUIComponent
-from Components.Label import Label
from Components.MultiContent import MultiContentEntryText
from Plugins.Plugin import PluginDescriptor
from Components.MultiContent import MultiContentEntryText
from Plugins.Plugin import PluginDescriptor
-from enigma import eListboxPythonMultiContent, eListbox, gFont,
iServiceInformation, RT_HALIGN_LEFT, RT_HALIGN_RIGH
T, RT_WRAP
+from enigma import eListboxPythonMultiContent, eListbox, gFont,
RT_HALIGN_LEF
T, RT_WRAP
-from twisted.web import server
-from twisted.web.resource import Resource
from twisted.web.client import getPage
import xml.dom.minidom
from twisted.web.client import getPage
import xml.dom.minidom
@@
-22,10
+19,11
@@
from sets import Set
my_global_session = None
my_global_session = None
-urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"]
+#urls = ["http://www.heise.de/newsticker/heise.rdf", "http://rss.slashdot.org/Slashdot/slashdot/to"]
+urls = ["http://mastermaq.podcastspot.com/episodes/rss/mpg1"]
from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry
from Components.config import config, ConfigSubsection, ConfigSelection, getConfigListEntry
-from Components.ConfigList import ConfigList
, ConfigList
Screen
+from Components.ConfigList import ConfigListScreen
config.simpleRSS = ConfigSubsection()
config.simpleRSS.hostname = ConfigSelection(choices = urls)
config.simpleRSS = ConfigSubsection()
config.simpleRSS.hostname = ConfigSelection(choices = urls)
@@
-36,8
+34,6
@@
class SimpleRSS(ConfigListScreen, Screen):
</screen>"""
def __init__(self, session, args = None):
</screen>"""
def __init__(self, session, args = None):
- from Tools.BoundFunction import boundFunction
-
print "screen init"
Screen.__init__(self, session)
self.skin = SimpleRSS.skin
print "screen init"
Screen.__init__(self, session)
self.skin = SimpleRSS.skin
@@
-143,7
+139,7
@@
class RSSPoller:
def __init__(self):
self.poll_timer = eTimer()
def __init__(self):
self.poll_timer = eTimer()
- self.poll_timer.
timeout.get()
.append(self.poll)
+ self.poll_timer.
callback
.append(self.poll)
self.poll_timer.start(0, 1)
self.last_links = Set()
self.dialog = None
self.poll_timer.start(0, 1)
self.last_links = Set()
self.dialog = None
@@
-235,10
+231,10
@@
class RSSPoller:
self.d = getPage(config.simpleRSS.hostname.value).addCallback(self._gotPage).addErrback(self.error)
def shutdown(self):
self.d = getPage(config.simpleRSS.hostname.value).addCallback(self._gotPage).addErrback(self.error)
def shutdown(self):
- self.poll_timer.
timeout.get()
.remove(self.poll)
+ self.poll_timer.
callback
.remove(self.poll)
self.poll_timer = None
self.poll_timer = None
-def main(session):
+def main(session
, **kwargs
):
print "session.open"
session.open(SimpleRSS)
print "done"
print "session.open"
session.open(SimpleRSS)
print "done"