github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-12 08:16:06 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix formatting and add pretag

Browse source
This commit is contained in:
Hellowlol 2016-05-09 22:41:07 +02:00
parent 9ae441b75a
commit 43bbf32098
1 changed files with 23 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

35
plexpy/webserve.py
View file

@ -17,6 +17,7 @@ import hashlib
import json import json
import os import os
import random import random
import shutil
import threading import threading
import cherrypy import cherrypy
@ -1905,13 +1906,6 @@ class WebInterface(object):
##### Logs ##### ##### Logs #####
@cherrypy.expose
def makeerror(self):
try:
1 / 0
except Exception as e:
logger.exception(e)
@cherrypy.expose @cherrypy.expose
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
def logs(self): def logs(self):
@ -1939,6 +1933,14 @@ class WebInterface(object):
if 'search[regex]' in kwargs: if 'search[regex]' in kwargs:
search_regex = kwargs.get('search[regex]', "") search_regex = kwargs.get('search[regex]', "")
def oh_i_feel_so_dirty(s):
""" Really inefficient helper to only allow one pre tag,
atleast it better then regex..
"""
s = s.encode('utf-8').replace('<pre>', '').replace('</pre>', '')
s = '<pre>%s</pre>' % s
return s
filt = [] filt = []
fa = filt.append fa = filt.append
with open(os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log')) as f: with open(os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log')) as f:
@ -1951,7 +1953,9 @@ class WebInterface(object):
except IndexError: except IndexError:
# Add traceback message to previous msg.. # Add traceback message to previous msg..
tl = (len(filt) - 1) tl = (len(filt) - 1)
filt[tl][2] += ' ' + l.replace('\n', '') filt[tl][2] += ' ' + l
# Inject the pre tag since we only want it on tracebacks
filt[tl][2] = oh_i_feel_so_dirty(filt[tl][2])
continue continue
filtered = [] filtered = []
@ -2883,24 +2887,31 @@ class WebInterface(object):
return serve_download(os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log'), name='plexpy.log') return serve_download(os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log'), name='plexpy.log')
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def delete_image_cache(self): def delete_image_cache(self):
""" Deletes the image cache dir and recreates it """ """ Deletes the image cache dir and recreates it """
cache_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, 'images') cache_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, 'images')
result = 'success'
msg = 'Deleted your cache images'
try: try:
os.rmdir(cache_dir) shutil.rmtree(cache_dir, ignore_errors=True)
except OSError as e: except OSError as e:
logger.exception('Failed to delete %s %s' % (cache_dir, e)) result = 'error'
msg = 'Failed to delete %s %s' % (cache_dir, e)
logger.exception(msg)
return return
try: try:
os.makedirs(cache_dir) os.makedirs(cache_dir)
except OSError as e: except OSError as e:
logger.exception('Faild to make %s %s' % (cache_dir, e)) result = 'error'
msg = 'Failed to make %s %s' % (cache_dir, e)
logger.exception(msg)
return return
return {'result': 'success', 'message': 'Deleted image cache'} return {'result': result, 'message': msg}
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out() @cherrypy.tools.json_out()