Browse Source

import send_from_directory inside the function itself

pull/69/head
Ruud 13 years ago
parent
commit
0c920a2f05
  1. 3
      couchpotato/core/plugins/base.py
  2. 7
      couchpotato/core/plugins/file/main.py

3
couchpotato/core/plugins/base.py

@ -3,7 +3,6 @@ from couchpotato.core.event import fireEvent, addEvent
from couchpotato.core.helpers.variable import getExt
from couchpotato.core.logger import CPLog
from couchpotato.environment import Env
from flask.helpers import send_from_directory
from flask.templating import render_template_string
from multipartpost import MultipartPostHandler
from urlparse import urlparse
@ -67,6 +66,8 @@ class Plugin(object):
def showStatic(self, filename):
d = os.path.join(self.plugin_path, 'static')
from flask.helpers import send_from_directory
return send_from_directory(d, filename)
def createFile(self, path, content, binary = False):

7
couchpotato/core/plugins/file/main.py

@ -7,8 +7,6 @@ from couchpotato.core.logger import CPLog
from couchpotato.core.plugins.base import Plugin
from couchpotato.core.settings.model import FileType, File
from couchpotato.environment import Env
from flask.helpers import send_from_directory
from sqlalchemy.sql.expression import or_
import os.path
log = CPLog(__name__)
@ -21,13 +19,14 @@ class FileManager(Plugin):
addEvent('file.download', self.download)
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')
filename = os.path.basename(filename)
from flask.helpers import send_from_directory
return send_from_directory(cache_dir, filename)
def download(self, url = '', dest = None, overwrite = False):

Loading…
Cancel
Save