@@ -2056,7 +2079,7 @@ $(document).ready(function() {
postSaveChecks();
return false;
} else {
- showMsg('
Please verify your settings.', false, true, 2000, true)
+ showMsg('
Please verify your settings.', false, true, 5000, true)
}
}
@@ -2069,17 +2092,19 @@ $(document).ready(function() {
});
$("#menu_link_shutdown").click(function() {
- var r = confirm("Are you sure you want to shutdown PlexPy?");
- if (r == true) {
+ $("#confirm-message").text("Are you sure you want to shutdown PlexPy?");
+ $('#confirm-modal').modal();
+ $('#confirm-modal').one('click', '#confirm-button', function () {
window.location.href = "shutdown";
- }
+ });
});
$("#menu_link_restart").click(function() {
- var r = confirm("Are you sure you want to restart PlexPy?");
- if (r == true) {
+ $("#confirm-message").text("Are you sure you want to restart PlexPy?");
+ $('#confirm-modal').modal();
+ $('#confirm-modal').one('click', '#confirm-button', function () {
window.location.href = "restart";
- }
+ });
});
$("#menu_link_update_check").click(function() {
@@ -2094,6 +2119,66 @@ $(document).ready(function() {
window.location.href = "restart";
});
+ $("#backup_database").click(function () {
+ $("#confirm-message").text("Are you sure you want to create a backup of the PlexPy database?");
+ $('#confirm-modal').modal();
+ $('#confirm-modal').one('click', '#confirm-button', function () {
+ $.ajax({
+ url: 'backup_db',
+ type: 'POST',
+ complete: function (xhr, status) {
+ result = $.parseJSON(xhr.responseText);
+ msg = result.message;
+ if (result.result == 'success') {
+ showMsg('
' + msg, false, true, 5000)
+ } else {
+ showMsg('
' + msg, false, true, 5000, true)
+ }
+ }
+ });
+ });
+ });
+
+ $("#clear_cache").click(function () {
+ $("#confirm-message").text("Are you sure you want to clear the PlexPy cache?");
+ $('#confirm-modal').modal();
+ $('#confirm-modal').one('click', '#confirm-button', function () {
+ $.ajax({
+ url: 'delete_cache',
+ type: 'POST',
+ complete: function (xhr, status) {
+ result = $.parseJSON(xhr.responseText);
+ msg = result.message;
+ if (result.result == 'success') {
+ showMsg('
' + msg, false, true, 5000)
+ } else {
+ showMsg('
' + msg, false, true, 5000, true)
+ }
+ }
+ });
+ });
+ });
+
+ $("#clear_logs").click(function () {
+ $("#confirm-message").text("Are you sure you want to clear the PlexPy logs?");
+ $('#confirm-modal').modal();
+ $('#confirm-modal').one('click', '#confirm-button', function () {
+ $.ajax({
+ url: 'delete_logs',
+ type: 'POST',
+ complete: function (xhr, status) {
+ result = $.parseJSON(xhr.responseText);
+ msg = result.message;
+ if (result.result == 'success') {
+ showMsg('
' + msg, false, true, 5000)
+ } else {
+ showMsg('
' + msg, false, true, 5000, true)
+ }
+ }
+ });
+ });
+ });
+
if ($("#api_enabled").is(":checked")) {
$("#apioptions").show();
} else {
@@ -2235,7 +2320,7 @@ $(document).ready(function() {
$("#pms-verify").html('
');
$('#pms-verify').fadeIn('fast');
$("#pms-ip-group").addClass("has-error");
- showMsg('
Could not verify your server.', false, true, 2000, true)
+ showMsg('
Could not verify your server.', false, true, 5000, true)
}
}
});
@@ -2243,7 +2328,7 @@ $(document).ready(function() {
$("#pms-verify").html('
');
$('#pms-verify').fadeIn('fast');
$("#pms-ip-group").addClass("has-error");
- showMsg('
Could not verify your server.', false, true, 2000, true)
+ showMsg('
Could not verify your server.', false, true, 5000, true)
}
}
@@ -2326,7 +2411,7 @@ $(document).ready(function() {
$('#osxnotifyregister').click(function () {
var osx_notify_app = $("#osx_notify_reg").val();
- $.get("/osxnotifyregister", { 'app': osx_notify_app }, function (data) { showMsg("
" + data + "
", false, true, 3000); });
+ $.get("/osxnotifyregister", { 'app': osx_notify_app }, function (data) { showMsg("
" + data + "
", false, true, 3000); });
})
pms_version = false;
diff --git a/plexpy/api.py b/plexpy/api.py
index 5d1d3b58..5f38fcd1 100644
--- a/plexpy/api.py
+++ b/plexpy/api.py
@@ -214,7 +214,7 @@ class Api(object):
}
]
"""
- logfile = os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log')
+ logfile = os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)
templog = []
start = int(kwargs.get('start', 0))
end = int(kwargs.get('end', 0))
diff --git a/plexpy/api2.py b/plexpy/api2.py
index 65ca2ee5..99d65ed8 100644
--- a/plexpy/api2.py
+++ b/plexpy/api2.py
@@ -148,7 +148,7 @@ class API2:
```
"""
- logfile = os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log')
+ logfile = os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME)
templog = []
start = int(kwargs.get('start', 0))
end = int(kwargs.get('end', 0))
diff --git a/plexpy/config.py b/plexpy/config.py
index 790c4688..f2f3b012 100644
--- a/plexpy/config.py
+++ b/plexpy/config.py
@@ -86,6 +86,7 @@ _CONFIG_DEFINITIONS = {
'BUFFER_WAIT': (int, 'Monitoring', 900),
'BACKUP_DIR': (str, 'General', ''),
'CACHE_DIR': (str, 'General', ''),
+ 'CACHE_IMAGES': (int, 'General', 1),
'CACHE_SIZEMB': (int, 'Advanced', 32),
'CHECK_GITHUB': (int, 'General', 1),
'CHECK_GITHUB_INTERVAL': (int, 'General', 360),
diff --git a/plexpy/datafactory.py b/plexpy/datafactory.py
index 8fce4f84..4110c70b 100644
--- a/plexpy/datafactory.py
+++ b/plexpy/datafactory.py
@@ -1301,7 +1301,7 @@ class DataFactory(object):
logger.info(u"PlexPy DataFactory :: Clearing notification logs from database.")
monitor_db.action('DELETE FROM notify_log')
monitor_db.action('VACUUM')
- return 'Cleared notification logs.'
+ return True
except Exception as e:
logger.warn(u"PlexPy DataFactory :: Unable to execute database query for delete_notification_log: %s." % e)
- return 'Unable to clear notification logs.'
\ No newline at end of file
+ return False
\ No newline at end of file
diff --git a/plexpy/pmsconnect.py b/plexpy/pmsconnect.py
index 65eab009..e0a4c6f5 100644
--- a/plexpy/pmsconnect.py
+++ b/plexpy/pmsconnect.py
@@ -1917,7 +1917,7 @@ class PmsConnect(object):
return result[0], result[1]
else:
- logger.error(u"PlexPy Pmsconnect :: Image proxy queries but no input received.")
+ logger.error(u"PlexPy Pmsconnect :: Image proxy queried but no input received.")
def get_search_results(self, query=''):
"""
diff --git a/plexpy/webserve.py b/plexpy/webserve.py
index 4578336c..a4a92aa2 100644
--- a/plexpy/webserve.py
+++ b/plexpy/webserve.py
@@ -1948,17 +1948,9 @@ class WebInterface(object):
if 'search[regex]' in kwargs:
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('
', '').replace('', '')
- s = '
%s
' % s
- return s
-
filt = []
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, logger.FILENAME)) as f:
for l in f.readlines():
try:
temp_loglevel_and_time = l.split('- ')
@@ -1966,11 +1958,11 @@ class WebInterface(object):
msg = l.split(' : ')[1].replace('\n', '')
fa([temp_loglevel_and_time[0], loglvl, msg])
except IndexError:
- # Add traceback message to previous msg..
+ # Add traceback message to previous msg.
tl = (len(filt) - 1)
- 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])
+ n = len(l) - len(l.lstrip(' '))
+ l = ' ' * (2*n) + l[n:]
+ filt[tl][2] += '
' + l
continue
filtered = []
@@ -2112,20 +2104,27 @@ class WebInterface(object):
"""
data_factory = datafactory.DataFactory()
result = data_factory.delete_notification_log()
- result = result if result else 'no data received'
+ res = 'success' if result else 'error'
+ msg = 'Cleared notification logs.' if result else 'Failed to clear notification logs.'
- return {'message': result}
+ return {'result': res, 'message': msg}
@cherrypy.expose
+ @cherrypy.tools.json_out()
@requireAuth(member_of("admin"))
- def clearLogs(self):
+ def delete_logs(self):
+ log_file = logger.FILENAME
try:
- open(os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log'), 'w').close()
+ open(os.path.join(plexpy.CONFIG.LOG_DIR, log_file), 'w').close()
+ result = 'success'
+ msg = 'Cleared the %s file.' % log_file
+ logger.info(msg)
except Exception as e:
- logger.exception(u'Failed to delete plexpy.log %s' % e)
+ result = 'error'
+ msg = 'Failed to clear the %s file.' % log_file
+ logger.exception(u'Failed to clear the %s file: %s.' % (log_file, e))
- logger.info(u'plexpy.log cleared')
- raise cherrypy.HTTPRedirect("logs")
+ return {'result': result, 'message': msg}
@cherrypy.expose
@requireAuth(member_of("admin"))
@@ -2151,7 +2150,7 @@ class WebInterface(object):
@requireAuth(member_of("admin"))
def logFile(self):
try:
- with open(os.path.join(plexpy.CONFIG.LOG_DIR, 'plexpy.log'), 'r') as f:
+ with open(os.path.join(plexpy.CONFIG.LOG_DIR, logger.FILENAME), 'r') as f:
return '
%s
' % f.read()
except IOError as e:
return "Log file not found."
@@ -2282,7 +2281,8 @@ class WebInterface(object):
"buffer_wait": plexpy.CONFIG.BUFFER_WAIT,
"group_history_tables": checked(plexpy.CONFIG.GROUP_HISTORY_TABLES),
"git_token": plexpy.CONFIG.GIT_TOKEN,
- "imgur_client_id": plexpy.CONFIG.IMGUR_CLIENT_ID
+ "imgur_client_id": plexpy.CONFIG.IMGUR_CLIENT_ID,
+ "cache_images": checked(plexpy.CONFIG.CACHE_IMAGES)
}
return serve_template(templatename="settings.html", title="Settings", config=config)
@@ -2304,7 +2304,7 @@ class WebInterface(object):
"ip_logging_enable", "movie_logging_enable", "tv_logging_enable", "music_logging_enable",
"notify_consecutive", "notify_upload_posters", "notify_recently_added", "notify_recently_added_grandparent",
"monitor_pms_updates", "monitor_remote_access", "get_file_sizes", "log_blacklist", "http_hash_password",
- "allow_guest_access"
+ "allow_guest_access", "cache_images"
]
for checked_config in checked_configs:
if checked_config not in kwargs:
@@ -2443,9 +2443,9 @@ class WebInterface(object):
result = database.make_backup()
if result:
- return {'message': 'Database backup successful.'}
+ return {'result': 'success', 'message': 'Database backup successful.'}
else:
- return {'message': 'Database backup failed.'}
+ return {'result': 'error', 'message': 'Database backup failed.'}
@cherrypy.expose
@requireAuth(member_of("admin"))
@@ -2834,15 +2834,15 @@ class WebInterface(object):
@cherrypy.expose
@requireAuth()
- def pms_image_proxy(self, img='', ratingkey=None, width='0', height='0', fallback=None, **kwargs):
- """ Grabs the images from pms and saved them to disk """
+ def pms_image_proxy(self, img='', rating_key=None, width='0', height='0', fallback=None, **kwargs):
+ """ Gets an image from the PMS and saves it to the image cache directory. """
- if not img and not ratingkey:
- logger.debug('No image input received')
+ if not img and not rating_key:
+ logger.error('No image input received.')
return
- if ratingkey and not img:
- img = '/library/metadata/%s/thumb/1337' % ratingkey
+ if rating_key and not img:
+ img = '/library/metadata/%s/thumb/1337' % rating_key
img_string = img.rsplit('/', 1)[0]
img_string += '%s%s' % (width, height)
@@ -2867,7 +2867,7 @@ class WebInterface(object):
if result and result[0]:
cherrypy.response.headers['Content-type'] = result[1]
- if 'indexes' not in img:
+ if plexpy.CONFIG.CACHE_IMAGES and 'indexes' not in img:
with open(ffp, 'wb') as f:
f.write(result[0])
@@ -2876,7 +2876,7 @@ class WebInterface(object):
raise
except Exception as e:
- logger.debug('Failed to get image %s file %s falling back to %s' % (img, fp, e))
+ logger.exception(u'Failed to get image %s, falling back to %s.' % (img, fallback))
fbi = None
if fallback == 'poster':
fbi = common.DEFAULT_POSTER_THUMB
@@ -2894,38 +2894,49 @@ class WebInterface(object):
@requireAuth(member_of("admin"))
@addtoapi()
def download_log(self):
+ """ Download the PlexPy log file. """
+ log_file = logger.FILENAME
try:
logger.logger.flush()
except:
pass
- 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, log_file), name=log_file)
@cherrypy.expose
@cherrypy.tools.json_out()
@requireAuth(member_of("admin"))
@addtoapi()
def delete_image_cache(self):
- """ Deletes the image cache dir and recreates it """
- cache_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, 'images')
+ """ Delete and recreate the image cache directory. """
+ return self.delete_cache(folder='images')
+
+ @cherrypy.expose
+ @cherrypy.tools.json_out()
+ @requireAuth(member_of("admin"))
+ @addtoapi()
+ def delete_cache(self, folder=''):
+ """ Delete and recreate the cache directory. """
+ cache_dir = os.path.join(plexpy.CONFIG.CACHE_DIR, folder)
result = 'success'
- msg = 'Deleted your cache images'
+ msg = 'Cleared the %scache.' % (folder + ' ' if folder else '')
try:
shutil.rmtree(cache_dir, ignore_errors=True)
except OSError as e:
result = 'error'
- msg = 'Failed to delete %s %s' % (cache_dir, e)
- logger.exception(msg)
- return
+ msg = 'Failed to delete %s.' % cache_dir
+ logger.exception(u'Failed to delete %s: %s.' % (cache_dir, e))
+ return {'result': result, 'message': msg}
try:
os.makedirs(cache_dir)
except OSError as e:
result = 'error'
- msg = 'Failed to make %s %s' % (cache_dir, e)
- logger.exception(msg)
- return
+ msg = 'Failed to make %s.' % cache_dir
+ logger.exception(u'Failed to create %s: %s.' % (cache_dir, e))
+ return {'result': result, 'message': msg}
+ logger.info(msg)
return {'result': result, 'message': msg}
@cherrypy.expose