Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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

…_binaries
  • Loading branch information...
commit 297ad7187aeb08f2d247ad3af89a169c4502bd1f 2 parents 15b38af + 61226ed
Nic Wolfe authored January 28, 2011
2  data/interfaces/default/comingEpisodes.tmpl
@@ -219,7 +219,7 @@ Custom
219 219
                     #set $show_div = "ep_listing listing_toofar"
220 220
                     #set $too_late_header = True
221 221
                 #elif $cur_ep_airdate >= $today and $cur_ep_airdate < $next_week:
222  
-                    <br /><h1 class="day">$datetime.date.fromordinal($cur_ep_airdate).strftime("%A")</h1>
  222
+                    <br /><h1 class="day">$datetime.date.fromordinal($cur_ep_airdate).strftime("%A").decode('utf-8')</h1>
223 223
                     #if $cur_ep_airdate == $today:
224 224
                         #set $show_div = "ep_listing listing_current"
225 225
                     #else:
2  lib/hachoir_core/i18n.py
@@ -133,7 +133,7 @@ def _initGettext():
133 133
         return (_dummy_gettext, _dummy_ngettext)
134 134
 
135 135
     # Gettext variables
136  
-    package = hachoir_core.PACKAGE
  136
+    package = lib.hachoir_core.PACKAGE
137 137
     locale_dir = path.join(path.dirname(__file__), "..", "locale")
138 138
 
139 139
     # Initialize gettext module
2  lib/simplejson/scanner.py
@@ -2,7 +2,7 @@
2 2
 """
3 3
 import re
4 4
 try:
5  
-    from simplejson._speedups import make_scanner as c_make_scanner
  5
+    from lib.simplejson._speedups import make_scanner as c_make_scanner
6 6
 except ImportError:
7 7
     c_make_scanner = None
8 8
 
9  sickbeard/image_cache.py
@@ -46,10 +46,14 @@ def banner_path(self, tvdb_id):
46 46
         return ek.ek(os.path.join, self._cache_dir(), banner_file_name)
47 47
 
48 48
     def has_poster(self, tvdb_id):
49  
-        return ek.ek(os.path.isfile, self.poster_path(tvdb_id))
  49
+        poster_path = self.poster_path(tvdb_id)
  50
+        logger.log(u"Checking if file "+str(poster_path)+" exists", logger.DEBUG)
  51
+        return ek.ek(os.path.isfile, poster_path)
50 52
 
51 53
     def has_banner(self, tvdb_id):
52  
-        return ek.ek(os.path.isfile, self.banner_path(tvdb_id))
  54
+        banner_path = self.banner_path(tvdb_id)
  55
+        logger.log(u"Checking if file "+str(banner_path)+" exists", logger.DEBUG)
  56
+        return ek.ek(os.path.isfile, banner_path)
53 57
 
54 58
     BANNER = 1
55 59
     POSTER = 2
@@ -117,6 +121,7 @@ def fill_cache(self, show_obj):
117 121
                        }
118 122
 
119 123
         if not need_images[self.POSTER] and not need_images[self.BANNER]:
  124
+            logger.log(u"No new cache images needed, not retrieving new ones")
120 125
             return
121 126
         
122 127
         # check the show dir for images and use them

0 notes on commit 297ad71

Please sign in to comment.
Something went wrong with that request. Please try again.