Browse Source

Fixed issues with scene converting

tags/release_0.1.0
echel0n 11 years ago
parent
commit
277d630a6f
  1. 5
      gui/slick/interfaces/default/config_anime.tmpl
  2. 4
      sickbeard/failedProcessor.py
  3. 4
      sickbeard/postProcessor.py
  4. 4
      sickbeard/tvcache.py

5
gui/slick/interfaces/default/config_anime.tmpl

@ -7,14 +7,13 @@
#set global $topmenu="config"# #set global $topmenu="config"#
#include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl") #include $os.path.join($sickbeard.PROG_DIR, "gui/slick/interfaces/default/inc_top.tmpl")
<script type="text/javascript" src="$sbRoot/js/configAnime.js?$sbPID"></script>
<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
#if $varExists('header') #if $varExists('header')
<h1 class="header">$header</h1> <h1 class="header">$header</h1>
#else #else
<h1 class="title">$title</h1> <h1 class="title">$title</h1>
#end if #end if
<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
<div id="config"> <div id="config">
<div id="config-content"> <div id="config-content">

4
sickbeard/failedProcessor.py

@ -52,10 +52,10 @@ class FailedProcessor(object):
self._log(u"Warning: unable to find a valid release name.", logger.WARNING) self._log(u"Warning: unable to find a valid release name.", logger.WARNING)
raise exceptions.FailedProcessingFailed() raise exceptions.FailedProcessingFailed()
parser = NameParser(False)
try: try:
parsed = parser.parse(releaseName).convert() parser = NameParser(False, convert=True)
parsed = parser.parse(releaseName)
except InvalidNameException: except InvalidNameException:
self._log(u"Error: release name is invalid: " + releaseName, logger.WARNING) self._log(u"Error: release name is invalid: " + releaseName, logger.WARNING)
raise exceptions.FailedProcessingFailed() raise exceptions.FailedProcessingFailed()

4
sickbeard/postProcessor.py

@ -479,8 +479,8 @@ class PostProcessor(object):
return to_return return to_return
# parse the name to break it into show name, season, and episode # parse the name to break it into show name, season, and episode
np = NameParser(file, useIndexers=True) np = NameParser(file, useIndexers=True, convert=True)
parse_result = np.parse(name).convert() parse_result = np.parse(name)
self._log(u"Parsed " + name + " into " + str(parse_result).decode('utf-8', 'xmlcharrefreplace'), logger.DEBUG) self._log(u"Parsed " + name + " into " + str(parse_result).decode('utf-8', 'xmlcharrefreplace'), logger.DEBUG)

4
sickbeard/tvcache.py

@ -264,8 +264,8 @@ class TVCache():
def _addCacheEntry(self, name, url, quality=None): def _addCacheEntry(self, name, url, quality=None):
try: try:
myParser = NameParser() myParser = NameParser(convert=True)
parse_result = myParser.parse(name).convert() parse_result = myParser.parse(name)
except InvalidNameException: except InvalidNameException:
logger.log(u"Unable to parse the filename " + name + " into a valid episode", logger.DEBUG) logger.log(u"Unable to parse the filename " + name + " into a valid episode", logger.DEBUG)
return None return None

Loading…
Cancel
Save