Browse Source

Use simpler file.cache

pull/1610/merge
Ruud 12 years ago
parent
commit
5fd4312ff8
  1. 12
      couchpotato/core/plugins/file/main.py

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

@ -9,6 +9,8 @@ from couchpotato.core.plugins.base import Plugin
from couchpotato.core.plugins.scanner.main import Scanner from couchpotato.core.plugins.scanner.main import Scanner
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_file
from werkzeug.exceptions import NotFound
import os.path import os.path
import time import time
import traceback import traceback
@ -81,11 +83,13 @@ class FileManager(Plugin):
def showCacheFile(self, filename = ''): def showCacheFile(self, filename = ''):
cache_dir = Env.get('cache_dir') file_path = os.path.join(Env.get('cache_dir'), os.path.basename(filename))
filename = os.path.basename(filename)
from flask.helpers import send_from_directory if not os.path.isfile(file_path):
return send_from_directory(cache_dir, filename) log.error('File "%s" not found', file_path)
raise NotFound()
return send_file(file_path, conditional = True)
def download(self, url = '', dest = None, overwrite = False, urlopen_kwargs = {}): def download(self, url = '', dest = None, overwrite = False, urlopen_kwargs = {}):

Loading…
Cancel
Save