import send_from_directory inside the function itself
This commit is contained in:
1 parent
04d7a15d68
commit
0c920a2f05
2 files changed
+5
-5
No files matched your search
@@ -3,7 +3,6 @@ from couchpotato.core.event import fireEvent, addEvent
|
|||||||
from couchpotato.core.helpers.variable import getExt
|
from couchpotato.core.helpers.variable import getExt
|
||||||
from couchpotato.core.logger import CPLog
|
from couchpotato.core.logger import CPLog
|
||||||
from couchpotato.environment import Env
|
from couchpotato.environment import Env
|
||||||
from flask.helpers import send_from_directory
|
|
||||||
from flask.templating import render_template_string
|
from flask.templating import render_template_string
|
||||||
from multipartpost import MultipartPostHandler
|
from multipartpost import MultipartPostHandler
|
||||||
from urlparse import urlparse
|
from urlparse import urlparse
|
||||||
@@ -67,6 +66,8 @@ class Plugin(object):
|
|||||||
|
|
||||||
def showStatic(self, filename):
|
def showStatic(self, filename):
|
||||||
d = os.path.join(self.plugin_path, 'static')
|
d = os.path.join(self.plugin_path, 'static')
|
||||||
|
|
||||||
|
from flask.helpers import send_from_directory
|
||||||
return send_from_directory(d, filename)
|
return send_from_directory(d, filename)
|
||||||
|
|
||||||
def createFile(self, path, content, binary = False):
|
def createFile(self, path, content, binary = False):
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ from couchpotato.core.logger import CPLog
|
|||||||
from couchpotato.core.plugins.base import Plugin
|
from couchpotato.core.plugins.base import Plugin
|
||||||
from couchpotato.core.settings.model import FileType, File
|
from couchpotato.core.settings.model import FileType, File
|
||||||
from couchpotato.environment import Env
|
from couchpotato.environment import Env
|
||||||
from flask.helpers import send_from_directory
|
|
||||||
from sqlalchemy.sql.expression import or_
|
|
||||||
import os.path
|
import os.path
|
||||||
|
|
||||||
log = CPLog(__name__)
|
log = CPLog(__name__)
|
||||||
@@ -21,13 +19,14 @@ class FileManager(Plugin):
|
|||||||
addEvent('file.download', self.download)
|
addEvent('file.download', self.download)
|
||||||
addEvent('file.types', self.getTypes)
|
addEvent('file.types', self.getTypes)
|
||||||
|
|
||||||
addApiView('file.cache/<path:filename>', self.showImage)
|
addApiView('file.cache/<path:filename>', self.showCacheFile, static = True)
|
||||||
|
|
||||||
def showImage(self, filename = ''):
|
def showCacheFile(self, filename = ''):
|
||||||
|
|
||||||
cache_dir = Env.get('cache_dir')
|
cache_dir = Env.get('cache_dir')
|
||||||
filename = os.path.basename(filename)
|
filename = os.path.basename(filename)
|
||||||
|
|
||||||
|
from flask.helpers import send_from_directory
|
||||||
return send_from_directory(cache_dir, filename)
|
return send_from_directory(cache_dir, filename)
|
||||||
|
|
||||||
def download(self, url = '', dest = None, overwrite = False):
|
def download(self, url = '', dest = None, overwrite = False):
|
||||||
|
|||||||
Reference in new issue
Block a user