From 785c2d37db0e5b27485eac2f7231235049148549 Mon Sep 17 00:00:00 2001
From: echel0n <sickrage.tv@gmail.com>
Date: Wed, 10 Dec 2014 10:30:38 -0800
Subject: [PATCH] Fixed issues with cached images not loading correctly, major
 speed improvement! Fixed issues with saving config.

---
 sickbeard/webserve.py     | 46 +++++++++++++++++++--------------------
 sickbeard/webserveInit.py | 12 ++++------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
index eb165399..f746342c 100644
--- a/sickbeard/webserve.py
+++ b/sickbeard/webserve.py
@@ -17,9 +17,7 @@
 # along with SickRage.  If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import with_statement
-import inspect
 
-import threading
 import traceback
 import os
 import time
@@ -75,10 +73,10 @@ except ImportError:
 
 from Cheetah.Template import Template
 
-from functools import wraps
 from tornado.routes import route
-from tornado.web import RequestHandler, HTTPError, authenticated, addslash, removeslash, asynchronous
-from tornado.gen import coroutine, Task
+from tornado.httpclient import AsyncHTTPClient
+from tornado.web import RequestHandler, HTTPError, authenticated, asynchronous
+from tornado.gen import coroutine
 from tornado.concurrent import run_on_executor
 from concurrent.futures import ThreadPoolExecutor
 
@@ -226,13 +224,12 @@ class BaseHandler(RequestHandler):
 class WebHandler(BaseHandler):
     executor = ThreadPoolExecutor(10)
 
-    @addslash
     @coroutine
     @asynchronous
     @authenticated
     def get(self, route, *args, **kwargs):
         try:
-            route = route.strip('/') or 'index'
+            route = route.strip('/').replace('.', '_') or 'index'
 
             # get route
             method = getattr(self, route)
@@ -244,27 +241,28 @@ class WebHandler(BaseHandler):
 
     @run_on_executor
     def async_worker(self, method, callback):
-        # get params
         kwargs = self.request.arguments
         for arg, value in kwargs.items():
             if len(value) == 1:
                 kwargs[arg] = value[0]
 
-        # get result
         try:
-            result = ek.ss(method(**kwargs)).encode('utf-8', 'xmlcharrefreplace')
+            callback(method(**kwargs))
+        except Exception as e:
+            callback()
+
+    def async_done(self, result=None):
+        try:
+            if result:
+                result = ek.ss(result).encode('utf-8', 'xmlcharrefreplace')
         except:
-            result = method(**kwargs)
+            pass
 
-        # finish result
-        callback(result)
+        if result:
+            self.write(result)
+            self.finish()
 
-    def async_done(self, result):
-        # write response
-        self.write(result)
-        self.finish()
-
-    # link post to get
+    # post and get use same method
     post = get
 
 class LoginHandler(BaseHandler):
@@ -394,12 +392,12 @@ class WebRoot(WebHandler):
             if ek.ek(os.path.isfile, image_file_name):
                 image_path = image_file_name
 
-        from mimetypes import MimeTypes
+        #from mimetypes import MimeTypes
+        #mime_type, encoding = MimeTypes().guess_type(image_path)
+        #self.set_header('Content-Type', mime_type)
 
-        mime_type, encoding = MimeTypes().guess_type(image_path)
-        self.set_header('Content-Type', mime_type)
-        with file(image_path, 'rb') as img:
-            return img.read()
+        static_image_path = image_path.replace(sickbeard.CACHE_DIR, '')
+        self.redirect(static_image_path)
 
     def setHomeLayout(self, layout):
 
diff --git a/sickbeard/webserveInit.py b/sickbeard/webserveInit.py
index dda3b221..c1b93cbb 100644
--- a/sickbeard/webserveInit.py
+++ b/sickbeard/webserveInit.py
@@ -12,13 +12,11 @@ from tornado.httpserver import HTTPServer
 from tornado.ioloop import IOLoop
 from tornado.routes import route
 
+
 class MultiStaticFileHandler(StaticFileHandler):
     def initialize(self, paths):
         self.paths = paths
 
-    def set_extra_headers(self, path):
-        self.set_header("Cache-control", "no-store, no-cache, must-revalidate, max-age=0")
-
     def get(self, path, include_body=True):
         for staticPath in self.paths:
             try:
@@ -28,7 +26,7 @@ class MultiStaticFileHandler(StaticFileHandler):
                 if e.status_code == 404:
                     continue
                 raise
-        self.set_status(404)
+        raise HTTPError(404)
 
 
 class SRWebServer(threading.Thread):
@@ -96,16 +94,14 @@ class SRWebServer(threading.Thread):
 
         # Main Handlers
         self.app.add_handlers('.*$', [
-            (r'/', RedirectHandler, {"url": self.options['web_root'] + '/home/'}),
             (r'%s(/?)' % self.options['api_root'], ApiHandler),
             (r'%s/getkey(/?)' % self.options['web_root'], KeyHandler),
-            (r'%s/api/builder' % self.options['web_root'], RedirectHandler,
-             {"url": self.options['web_root'] + '/apibuilder/'}),
+            (r'%s/api/builder' % self.options['web_root'], RedirectHandler, {"url": self.options['web_root'] + '/apibuilder'}),
             (r'%s/login(/?)' % self.options['web_root'], LoginHandler),
             (r'%s/logout(/?)' % self.options['web_root'], LogoutHandler),
         ] + route.get_routes(self.options['web_root']))
 
-        # Static Path Handlers
+        # Static Handlers
         self.app.add_handlers(".*$", [
             (r'%s/(favicon\.ico)' % self.options['web_root'], MultiStaticFileHandler,
              {'paths': [os.path.join(self.options['data_root'], 'images/ico/favicon.ico')]}),