mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-16 15:28:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

applying patch from David Mohr replacing the Timer object with LoopingCall

Browse source
This commit is contained in:
Fredrik Eriksson 2009-09-04 15:58:41 +00:00
commit 82682dbb2d
1 changed files with 10 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

48
deluge/plugins/feeder/feeder/core.py
View file

@ -40,6 +40,7 @@
import feedparser # for parsing rss feeds import feedparser # for parsing rss feeds
import threading # for threaded updates import threading # for threaded updates
import re # for regular expressions import re # for regular expressions
from twisted.internet.task import LoopingCall
from deluge.log import LOG as log from deluge.log import LOG as log
from deluge.plugins.pluginbase import CorePluginBase from deluge.plugins.pluginbase import CorePluginBase
@ -152,20 +153,6 @@ class Filter:
self.stop_at_ratio = conf['stop_at_ratio'] self.stop_at_ratio = conf['stop_at_ratio']
class Timer:
def Timer(self, curr_time, timeout, callback, data):
self.timeout = curr_time + timeout
"""Timeout is specified in seconds, since it is used by the update() method"""
self.callback = callback
self.data = data
def check_timeout(self, curr_time):
return curr_time == self.timeout
def execute(self):
self.callback(data)
class Core(CorePluginBase): class Core(CorePluginBase):
def enable(self): def enable(self):
self.config = deluge.configmanager.ConfigManager("feeder.conf", DEFAULT_PREFS) self.config = deluge.configmanager.ConfigManager("feeder.conf", DEFAULT_PREFS)
@ -176,12 +163,8 @@ class Core(CorePluginBase):
# Setting default timer to configured update time # Setting default timer to configured update time
for feed in self.config['feeds']: for feed in self.config['feeds']:
self.timers[feed] = Timer( self,time, self.timers[feed] = LoopingCall(self.update_feed, feed)
self.config['feeds'][feed].updatetime * 60, self.timers[feed].start( self.config['feeds'][feed].updatetime * 60)
self.update_feed, feed )
# update all feeds on startup
self.update_feeds()
def disable(self): def disable(self):
@ -190,10 +173,7 @@ class Core(CorePluginBase):
def update(self): def update(self):
self.time += 1 pass
for timer in self.timers:
if timer.check_timeout(time):
timer.execute()
@ -297,16 +277,14 @@ class Core(CorePluginBase):
newfeed.set_config(conf) newfeed.set_config(conf)
# Add a timer (with default timer for now, since we can't get ttl just yet)... # Add a timer (with default timer for now, since we can't get ttl just yet)...
self.timers[feedname] = Timer( self.time, self.timers[feedname] = LoopingCall(self.update_feed, feedname)
newfeed.updatetime * 60,
self.update_feed, feedname )
# Save the new feed # Save the new feed
self.config['feeds'].update({feedname: newfeed }) self.config['feeds'].update({feedname: newfeed })
self.config.save() self.config.save()
# And update the new feed # Start the timeout, which will also update the new feed
self.update_feed(feedname) self.timers[feedname].start(newfeed.updatetime * 60)
@export @export
def remove_feed(self, feedname): def remove_feed(self, feedname):
@ -314,6 +292,7 @@ class Core(CorePluginBase):
if self.feeds.has_key(feedname): # Check if we have the feed saved and remove it if self.feeds.has_key(feedname): # Check if we have the feed saved and remove it
del self.feeds[feedname] del self.feeds[feedname]
if self.timers.has_key(feedname): # Check if we have a timer for this feed and remove it if self.timers.has_key(feedname): # Check if we have a timer for this feed and remove it
self.timers[feedname].stop()
del self.timers[feedname] del self.timers[feedname]
if self.config['feeds'].has_key(feedname): # Check if we have the feed in the configuration and remove it if self.config['feeds'].has_key(feedname): # Check if we have the feed in the configuration and remove it
del self.config['feeds'][feedname] del self.config['feeds'][feedname]
@ -347,11 +326,6 @@ class Core(CorePluginBase):
#=================Internal functions================ #=================Internal functions================
def update_feeds(self):
"""Start threads to update all feeds"""
for feedname in self.config['feeds']:
self.update_feed(feedname)
def update_feed(self, feedname): def update_feed(self, feedname):
"""Start a thread to update a single feed""" """Start a thread to update a single feed"""
threading.Thread( threading.Thread(
@ -380,10 +354,8 @@ class Core(CorePluginBase):
if not self.feeds[feedname].ttl == self.config['feeds'][feedname].updatetime: if not self.feeds[feedname].ttl == self.config['feeds'][feedname].updatetime:
log.debug("feed '%s' request a ttl of %s, updating timer", feedname, self.feeds[feedname].ttl) log.debug("feed '%s' request a ttl of %s, updating timer", feedname, self.feeds[feedname].ttl)
self.config['feeds'][feedname].updatetime = self.feeds[feedname].ttl self.config['feeds'][feedname].updatetime = self.feeds[feedname].ttl
del self.timers[feedname] self.timers[feedname].stop()
self.timers[feedname] = Timer( self.time, self.timers[feedname].start(self.config['feeds'][feedname].updatetime * 60)
self.config['feeds'][feedname].updatetime * 60 * 1000,
self.update_feed, feedname )
except Exception, e: except Exception, e:
log.debug("feed '%s' has no ttl set, will use default timer", feedname) log.debug("feed '%s' has no ttl set, will use default timer", feedname)