Browse Source

Cleanup

pull/770/merge
Ruud 13 years ago
parent
commit
6b7d29bae1
  1. 6
      couchpotato/core/plugins/searcher/main.py
  2. 1
      couchpotato/core/providers/torrent/passthepopcorn/main.py

6
couchpotato/core/plugins/searcher/main.py

@ -23,7 +23,7 @@ class Searcher(Plugin):
in_progress = False in_progress = False
def __init__(self): def __init__(self):
addEvent('searcher.all', self.all_movies) addEvent('searcher.all', self.allMovies)
addEvent('searcher.single', self.single) addEvent('searcher.single', self.single)
addEvent('searcher.correct_movie', self.correctMovie) addEvent('searcher.correct_movie', self.correctMovie)
addEvent('searcher.download', self.download) addEvent('searcher.download', self.download)
@ -37,11 +37,11 @@ class Searcher(Plugin):
}) })
# Schedule cronjob # Schedule cronjob
fireEvent('schedule.cron', 'searcher.all', self.all_movies, day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute')) fireEvent('schedule.cron', 'searcher.all', self.allMovies, day = self.conf('cron_day'), hour = self.conf('cron_hour'), minute = self.conf('cron_minute'))
fireEvent('schedule.interval', 'searcher.check_snatched', self.checkSnatched, minutes = self.conf('run_every')) fireEvent('schedule.interval', 'searcher.check_snatched', self.checkSnatched, minutes = self.conf('run_every'))
def all_movies(self): def allMovies(self):
if self.in_progress: if self.in_progress:
log.info('Search already in progress') log.info('Search already in progress')

1
couchpotato/core/providers/torrent/passthepopcorn/main.py

@ -1,4 +1,3 @@
from bs4 import BeautifulSoup
from couchpotato.core.event import fireEvent from couchpotato.core.event import fireEvent
from couchpotato.core.helpers.encoding import tryUrlencode from couchpotato.core.helpers.encoding import tryUrlencode
from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts from couchpotato.core.helpers.variable import getTitle, tryInt, mergeDicts

Loading…
Cancel
Save