Permalink
Browse files

Merge branch 'master' of github.com:midgetspy/Sick-Beard into windows…

…_binaries
  • Loading branch information...
2 parents 15b38af + 61226ed commit 297ad7187aeb08f2d247ad3af89a169c4502bd1f @midgetspy midgetspy committed Jan 29, 2011
@@ -219,7 +219,7 @@ Custom
#set $show_div = "ep_listing listing_toofar"
#set $too_late_header = True
#elif $cur_ep_airdate >= $today and $cur_ep_airdate < $next_week:
- <br /><h1 class="day">$datetime.date.fromordinal($cur_ep_airdate).strftime("%A")</h1>
+ <br /><h1 class="day">$datetime.date.fromordinal($cur_ep_airdate).strftime("%A").decode('utf-8')</h1>
#if $cur_ep_airdate == $today:
#set $show_div = "ep_listing listing_current"
#else:
View
@@ -133,7 +133,7 @@ def _initGettext():
return (_dummy_gettext, _dummy_ngettext)
# Gettext variables
- package = hachoir_core.PACKAGE
+ package = lib.hachoir_core.PACKAGE
locale_dir = path.join(path.dirname(__file__), "..", "locale")
# Initialize gettext module
@@ -2,7 +2,7 @@
"""
import re
try:
- from simplejson._speedups import make_scanner as c_make_scanner
+ from lib.simplejson._speedups import make_scanner as c_make_scanner
except ImportError:
c_make_scanner = None
View
@@ -46,10 +46,14 @@ def banner_path(self, tvdb_id):
return ek.ek(os.path.join, self._cache_dir(), banner_file_name)
def has_poster(self, tvdb_id):
- return ek.ek(os.path.isfile, self.poster_path(tvdb_id))
+ poster_path = self.poster_path(tvdb_id)
+ logger.log(u"Checking if file "+str(poster_path)+" exists", logger.DEBUG)
+ return ek.ek(os.path.isfile, poster_path)
def has_banner(self, tvdb_id):
- return ek.ek(os.path.isfile, self.banner_path(tvdb_id))
+ banner_path = self.banner_path(tvdb_id)
+ logger.log(u"Checking if file "+str(banner_path)+" exists", logger.DEBUG)
+ return ek.ek(os.path.isfile, banner_path)
BANNER = 1
POSTER = 2
@@ -117,6 +121,7 @@ def fill_cache(self, show_obj):
}
if not need_images[self.POSTER] and not need_images[self.BANNER]:
+ logger.log(u"No new cache images needed, not retrieving new ones")
return
# check the show dir for images and use them

0 comments on commit 297ad71

Please sign in to comment.