From 277d630a6fc0892f1e8ee4450cdb49dd69afef13 Mon Sep 17 00:00:00 2001
From: echel0n <justin.tabish@gmail.com>
Date: Sat, 31 May 2014 03:35:57 -0700
Subject: [PATCH] Fixed issues with scene converting

---
 gui/slick/interfaces/default/config_anime.tmpl | 5 ++---
 sickbeard/failedProcessor.py                   | 4 ++--
 sickbeard/postProcessor.py                     | 4 ++--
 sickbeard/tvcache.py                           | 4 ++--
 4 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/gui/slick/interfaces/default/config_anime.tmpl b/gui/slick/interfaces/default/config_anime.tmpl
index 166c1102..3b42550e 100644
--- a/gui/slick/interfaces/default/config_anime.tmpl
+++ b/gui/slick/interfaces/default/config_anime.tmpl
@@ -7,14 +7,13 @@
 #set global $topmenu="config"#
 #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')
 	<h1 class="header">$header</h1>
 #else
 	<h1 class="title">$title</h1>
 #end if
-
-<script type="text/javascript" src="$sbRoot/js/config.js?$sbPID"></script>
-
 <div id="config">
 <div id="config-content">
 
diff --git a/sickbeard/failedProcessor.py b/sickbeard/failedProcessor.py
index 293da42d..9633fda3 100644
--- a/sickbeard/failedProcessor.py
+++ b/sickbeard/failedProcessor.py
@@ -52,10 +52,10 @@ class FailedProcessor(object):
             self._log(u"Warning: unable to find a valid release name.", logger.WARNING)
             raise exceptions.FailedProcessingFailed()
 
-        parser = NameParser(False)
 
         try:
-            parsed = parser.parse(releaseName).convert()
+            parser = NameParser(False, convert=True)
+            parsed = parser.parse(releaseName)
         except InvalidNameException:
             self._log(u"Error: release name is invalid: " + releaseName, logger.WARNING)
             raise exceptions.FailedProcessingFailed()
diff --git a/sickbeard/postProcessor.py b/sickbeard/postProcessor.py
index 78c14d47..fbe1057d 100644
--- a/sickbeard/postProcessor.py
+++ b/sickbeard/postProcessor.py
@@ -479,8 +479,8 @@ class PostProcessor(object):
             return to_return
 
         # parse the name to break it into show name, season, and episode
-        np = NameParser(file, useIndexers=True)
-        parse_result = np.parse(name).convert()
+        np = NameParser(file, useIndexers=True, convert=True)
+        parse_result = np.parse(name)
 
         self._log(u"Parsed " + name + " into " + str(parse_result).decode('utf-8', 'xmlcharrefreplace'), logger.DEBUG)
 
diff --git a/sickbeard/tvcache.py b/sickbeard/tvcache.py
index 101c17d9..aac429cf 100644
--- a/sickbeard/tvcache.py
+++ b/sickbeard/tvcache.py
@@ -264,8 +264,8 @@ class TVCache():
     def _addCacheEntry(self, name, url, quality=None):
 
         try:
-            myParser = NameParser()
-            parse_result = myParser.parse(name).convert()
+            myParser = NameParser(convert=True)
+            parse_result = myParser.parse(name)
         except InvalidNameException:
             logger.log(u"Unable to parse the filename " + name + " into a valid episode", logger.DEBUG)
             return None