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

Improve library delete/purge function

Browse source
This commit is contained in:
JonnyWong16 2020-04-10 14:00:19 -07:00
parent 104e2929df
commit 6a87dc9c40
No known key found for this signature in database
GPG key ID: B1F1F9807184697A
6 changed files with 130 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

26
data/interfaces/default/js/tables/libraries.js
View file

@ -27,8 +27,8 @@ libraries_list_table_options = {
"data": null, "data": null,
"createdCell": function (td, cellData, rowData, row, col) { "createdCell": function (td, cellData, rowData, row, col) {
$(td).html('<div class="edit-library-toggles">' + $(td).html('<div class="edit-library-toggles">' +
'<button class="btn btn-xs btn-warning delete-library" data-id="' + rowData['section_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' + '<button class="btn btn-xs btn-warning delete-library" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-trash-o fa-fw"></i> Delete</button>&nbsp' +
'<button class="btn btn-xs btn-warning purge-library" data-id="' + rowData['section_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' + '<button class="btn btn-xs btn-warning purge-library" data-id="' + rowData['row_id'] + '" data-toggle="button"><i class="fa fa-eraser fa-fw"></i> Purge</button>&nbsp&nbsp&nbsp' +
'<input type="checkbox" id="keep_history-' + rowData['section_id'] + '" name="keep_history" value="1" ' + rowData['keep_history'] + '><label class="edit-tooltip" for="keep_history-' + rowData['section_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp' + '<input type="checkbox" id="keep_history-' + rowData['section_id'] + '" name="keep_history" value="1" ' + rowData['keep_history'] + '><label class="edit-tooltip" for="keep_history-' + rowData['section_id'] + '" data-toggle="tooltip" title="Toggle History"><i class="fa fa-history fa-lg fa-fw"></i></label>&nbsp' +
'</div>'); '</div>');
}, },
@ -63,7 +63,7 @@ libraries_list_table_options = {
"data": "section_name", "data": "section_name",
"createdCell": function (td, cellData, rowData, row, col) { "createdCell": function (td, cellData, rowData, row, col) {
if (cellData !== null && cellData !== '') { if (cellData !== null && cellData !== '') {
$(td).html('<div data-id="' + rowData['section_id'] + '">' + $(td).html('<div data-id="' + rowData['row_id'] + '">' +
'<a href="library?section_id=' + rowData['section_id'] + '">' + cellData + '</a>' + '<a href="library?section_id=' + rowData['section_id'] + '">' + cellData + '</a>' +
'</div>'); '</div>');
} else { } else {
@ -234,11 +234,11 @@ libraries_list_table_options = {
showMsg(msg, false, false, 0) showMsg(msg, false, false, 0)
}, },
"rowCallback": function (row, rowData) { "rowCallback": function (row, rowData) {
if ($.inArray(rowData['section_id'], libraries_to_delete) !== -1) { if ($.inArray(rowData['row_id'], libraries_to_delete) !== -1) {
$(row).find('button.delete-library[data-id="' + rowData['section_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); $(row).find('button.delete-library[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
} }
if ($.inArray(rowData['section_id'], libraries_to_purge) !== -1) { if ($.inArray(rowData['row_id'], libraries_to_purge) !== -1) {
$(row).find('button.purge-library[data-id="' + rowData['section_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger'); $(row).find('button.purge-library[data-id="' + rowData['row_id'] + '"]').toggleClass('btn-warning').toggleClass('btn-danger');
} }
} }
} }
@ -279,11 +279,11 @@ $('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles
var row = libraries_list_table.row(tr); var row = libraries_list_table.row(tr);
var rowData = row.data(); var rowData = row.data();
var index_delete = $.inArray(rowData['section_id'], libraries_to_delete); var index_delete = $.inArray(rowData['row_id'], libraries_to_delete);
var index_purge = $.inArray(rowData['section_id'], libraries_to_purge); var index_purge = $.inArray(rowData['row_id'], libraries_to_purge);
if (index_delete === -1) { if (index_delete === -1) {
libraries_to_delete.push(rowData['section_id']); libraries_to_delete.push(rowData['row_id']);
if (index_purge === -1) { if (index_purge === -1) {
tr.find('button.purge-library').click(); tr.find('button.purge-library').click();
} }
@ -302,11 +302,11 @@ $('#libraries_list_table').on('click', 'td.edit-control > .edit-library-toggles
var row = libraries_list_table.row(tr); var row = libraries_list_table.row(tr);
var rowData = row.data(); var rowData = row.data();
var index_delete = $.inArray(rowData['section_id'], libraries_to_delete); var index_delete = $.inArray(rowData['row_id'], libraries_to_delete);
var index_purge = $.inArray(rowData['section_id'], libraries_to_purge); var index_purge = $.inArray(rowData['row_id'], libraries_to_purge);
if (index_purge === -1) { if (index_purge === -1) {
libraries_to_purge.push(rowData['section_id']); libraries_to_purge.push(rowData['row_id']);
} else { } else {
libraries_to_purge.splice(index_purge, 1); libraries_to_purge.splice(index_purge, 1);
if (index_delete != -1) { if (index_delete != -1) {

50
data/interfaces/default/libraries.html
View file

@ -116,14 +116,14 @@
}); });
if (libraries_to_delete.length > 0) { if (libraries_to_delete.length > 0) {
$('#libraries-to-delete').prepend('<p>Are you REALLY sure you want to delete the following libraries:</p>') $('#libraries-to-delete').prepend('<p>Are you REALLY sure you want to delete the following libraries:</p>');
for (var i = 0; i < libraries_to_delete.length; i++) { for (var i = 0; i < libraries_to_delete.length; i++) {
$('#libraries-to-delete').append('<li>' + $('div[data-id=' + libraries_to_delete[i] + ']').text() + '</li>'); $('#libraries-to-delete').append('<li>' + $('div[data-id=' + libraries_to_delete[i] + ']').text() + '</li>');
} }
} }
if (libraries_to_purge.length > 0) { if (libraries_to_purge.length > 0) {
$('#libraries-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following libraries:</p>') $('#libraries-to-purge').prepend('<p>Are you REALLY sure you want to purge all history for the following libraries:</p>');
for (var i = 0; i < libraries_to_purge.length; i++) { for (var i = 0; i < libraries_to_purge.length; i++) {
$('#libraries-to-purge').append('<li>' + $('div[data-id=' + libraries_to_purge[i] + ']').text() + '</li>'); $('#libraries-to-purge').append('<li>' + $('div[data-id=' + libraries_to_purge[i] + ']').text() + '</li>');
} }
@ -131,31 +131,27 @@
$('#confirm-modal-delete').modal(); $('#confirm-modal-delete').modal();
$('#confirm-modal-delete').one('click', '#confirm-delete', function () { $('#confirm-modal-delete').one('click', '#confirm-delete', function () {
libraries_to_delete.forEach(function(row, idx) { $.ajax({
$.ajax({ url: 'delete_library',
url: 'delete_library', type: 'POST',
type: 'POST', data: { row_ids: libraries_to_delete.join(',') },
data: { section_id: row }, cache: false,
cache: false, async: true,
async: true, success: function (data) {
success: function (data) { var msg = "Library deleted";
var msg = "Library deleted"; showMsg(msg, false, true, 2000);
showMsg(msg, false, true, 2000); }
}
});
}); });
libraries_to_purge.forEach(function(row, idx) { $.ajax({
$.ajax({ url: 'delete_all_library_history',
url: 'delete_all_library_history', type: 'POST',
type: 'POST', data: { row_ids: libraries_to_purge.join(',') },
data: { section_id: row }, cache: false,
cache: false, async: true,
async: true, success: function (data) {
success: function (data) { var msg = "Library history purged";
var msg = "Library history purged"; showMsg(msg, false, true, 2000);
showMsg(msg, false, true, 2000); }
}
});
}); });
libraries_list_table.draw(); libraries_list_table.draw();
}); });
@ -188,7 +184,7 @@
complete: function (xhr, status) { complete: function (xhr, status) {
var result = $.parseJSON(xhr.responseText); var result = $.parseJSON(xhr.responseText);
var msg = result.message; var msg = result.message;
if (result.result == 'success') { if (result.result === 'success') {
showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 2000, false); showMsg('<i class="fa fa-check"></i> ' + msg, false, true, 2000, false);
libraries_list_table.draw(); libraries_list_table.draw();
} else { } else {

21
plexpy/database.py
View file

@ -81,10 +81,27 @@ def delete_user_history(user_id=None):
monitor_db = MonitorDatabase() monitor_db = MonitorDatabase()
# Get all history associated with the user_id # Get all history associated with the user_id
result = monitor_db.select('SELECT id FROM session_history WHERE user_id = ?', [user_id]) result = monitor_db.select('SELECT id FROM session_history WHERE user_id = ?',
[user_id])
row_ids = [row['id'] for row in result] row_ids = [row['id'] for row in result]
logger.info(u"Tautulli Database :: Deleting all history for user id %s from database." % user_id) logger.info(u"Tautulli Database :: Deleting all history for user_id %s from database." % user_id)
return delete_session_history_rows(row_ids=row_ids)
def delete_library_history(server_id=None, section_id=None):
if server_id and str(section_id).isdigit():
monitor_db = MonitorDatabase()
# Get all history associated with the server_id and section_id
result = monitor_db.select('SELECT session_history.id FROM session_history '
'JOIN session_history_metadata ON session_history.id = session_history_metadata.id '
'WHERE session_history.server_id = ? AND session_history_metadata.section_id = ?',
[server_id, section_id])
row_ids = [row['id'] for row in result]
logger.info(u"Tautulli Database :: Deleting all history for library server_id %s and section_id %s from database."
% (server_id, section_id))
return delete_session_history_rows(row_ids=row_ids) return delete_session_history_rows(row_ids=row_ids)

100
plexpy/libraries.py
View file

@ -298,7 +298,9 @@ class Libraries(object):
group_by = 'session_history.reference_id' if grouping else 'session_history.id' group_by = 'session_history.reference_id' if grouping else 'session_history.id'
columns = ['library_sections.section_id', columns = ['library_sections.id AS row_id',
'library_sections.server_id',
'library_sections.section_id',
'library_sections.section_name', 'library_sections.section_name',
'library_sections.section_type', 'library_sections.section_type',
'library_sections.count', 'library_sections.count',
@ -312,7 +314,7 @@ class Libraries(object):
ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \ ELSE 0 END) - SUM(CASE WHEN session_history.paused_counter IS NULL THEN 0 ELSE \
session_history.paused_counter END) AS duration', session_history.paused_counter END) AS duration',
'MAX(session_history.started) AS last_accessed', 'MAX(session_history.started) AS last_accessed',
'MAX(session_history.id) AS id', 'MAX(session_history.id) AS history_row_id',
'session_history_metadata.full_title AS last_played', 'session_history_metadata.full_title AS last_played',
'session_history.rating_key', 'session_history.rating_key',
'session_history_metadata.media_type', 'session_history_metadata.media_type',
@ -371,7 +373,9 @@ class Libraries(object):
else: else:
library_thumb = common.DEFAULT_COVER_THUMB library_thumb = common.DEFAULT_COVER_THUMB
row = {'section_id': item['section_id'], row = {'row_id': item['row_id'],
'server_id': item['server_id'],
'section_id': item['section_id'],
'section_name': item['section_name'], 'section_name': item['section_name'],
'section_type': item['section_type'], 'section_type': item['section_type'],
'count': item['count'], 'count': item['count'],
@ -382,7 +386,7 @@ class Libraries(object):
'plays': item['plays'], 'plays': item['plays'],
'duration': item['duration'], 'duration': item['duration'],
'last_accessed': item['last_accessed'], 'last_accessed': item['last_accessed'],
'id': item['id'], 'history_row_id': item['history_row_id'],
'last_played': item['last_played'], 'last_played': item['last_played'],
'rating_key': item['rating_key'], 'rating_key': item['rating_key'],
'media_type': item['media_type'], 'media_type': item['media_type'],
@ -736,7 +740,9 @@ class Libraries(object):
logger.warn(u"Tautulli Libraries :: Unable to execute database query for set_config: %s." % e) logger.warn(u"Tautulli Libraries :: Unable to execute database query for set_config: %s." % e)
def get_details(self, section_id=None): def get_details(self, section_id=None):
default_return = {'section_id': 0, default_return = {'row_id': 0,
'server_id': '',
'section_id': 0,
'section_name': 'Local', 'section_name': 'Local',
'section_type': '', 'section_type': '',
'library_thumb': common.DEFAULT_COVER_THUMB, 'library_thumb': common.DEFAULT_COVER_THUMB,
@ -759,7 +765,8 @@ class Libraries(object):
try: try:
if str(section_id).isdigit(): if str(section_id).isdigit():
query = 'SELECT section_id, section_name, section_type, count, parent_count, child_count, ' \ query = 'SELECT id AS row_id, server_id, section_id, section_name, section_type, ' \
'count, parent_count, child_count, ' \
'thumb AS library_thumb, custom_thumb_url AS custom_thumb, art AS library_art, ' \ 'thumb AS library_thumb, custom_thumb_url AS custom_thumb, art AS library_art, ' \
'custom_art_url AS custom_art, is_active, ' \ 'custom_art_url AS custom_art, is_active, ' \
'do_notify, do_notify_created, keep_history, deleted_section ' \ 'do_notify, do_notify_created, keep_history, deleted_section ' \
@ -787,7 +794,9 @@ class Libraries(object):
else: else:
library_art = item['library_art'] library_art = item['library_art']
library_details = {'section_id': item['section_id'], library_details = {'row_id': item['row_id'],
'server_id': item['server_id'],
'section_id': item['section_id'],
'section_name': item['section_name'], 'section_name': item['section_name'],
'section_type': item['section_type'], 'section_type': item['section_type'],
'library_thumb': library_thumb, 'library_thumb': library_thumb,
@ -1015,60 +1024,39 @@ class Libraries(object):
return libraries return libraries
def delete_all_history(self, section_id=None): def delete(self, server_id=None, section_id=None, row_ids=None, purge_only=False):
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()
try: if row_ids and row_ids is not None:
if section_id.isdigit(): row_ids = map(helpers.cast_to_int, row_ids.split(','))
logger.info(u"Tautulli Libraries :: Deleting all history for library id %s from database." % section_id)
session_history_media_info_del = \
monitor_db.action('DELETE FROM '
'session_history_media_info '
'WHERE session_history_media_info.id IN (SELECT session_history_media_info.id '
'FROM session_history_media_info '
'JOIN session_history_metadata ON session_history_media_info.id = session_history_metadata.id '
'WHERE session_history_metadata.section_id = ?)', [section_id])
session_history_del = \
monitor_db.action('DELETE FROM '
'session_history '
'WHERE session_history.id IN (SELECT session_history.id '
'FROM session_history '
'JOIN session_history_metadata ON session_history.id = session_history_metadata.id '
'WHERE session_history_metadata.section_id = ?)', [section_id])
session_history_metadata_del = \
monitor_db.action('DELETE FROM '
'session_history_metadata '
'WHERE session_history_metadata.section_id = ?', [section_id])
return 'Deleted all items for section_id %s.' % section_id # Get the user_ids corresponding to the row_ids
result = monitor_db.select('SELECT server_id, section_id FROM library_sections '
'WHERE id IN ({})'.format(','.join(['?'] * len(row_ids))), row_ids)
success = []
for library in result:
success.append(self.delete(server_id=library['server_id'], section_id=library['section_id'],
purge_only=purge_only))
return all(success)
elif server_id and str(section_id).isdigit():
database.delete_library_history(server_id=server_id, section_id=section_id)
if purge_only:
return True
else: else:
return 'Unable to delete items, section_id not valid.' logger.info(u"Tautulli Libraries :: Deleting library with server_id %s and section_id %s from database."
except Exception as e: % (server_id, section_id))
logger.warn(u"Tautulli Libraries :: Unable to execute database query for delete_all_history: %s." % e) try:
monitor_db.action('UPDATE library_sections '
'SET deleted_section = 1, keep_history = 0, do_notify = 0, do_notify_created = 0 '
'WHERE server_id = ? AND section_id = ?', [server_id, section_id])
return True
except Exception as e:
logger.warn(u"Tautulli Libraries :: Unable to execute database query for delete: %s." % e)
def delete(self, section_id=None): else:
monitor_db = database.MonitorDatabase() return False
try:
if section_id.isdigit():
self.delete_all_history(section_id)
logger.info(u"Tautulli Libraries :: Deleting library with id %s from database." % section_id)
monitor_db.action('UPDATE library_sections SET deleted_section = 1 WHERE section_id = ?', [section_id])
monitor_db.action('UPDATE library_sections SET keep_history = 0 WHERE section_id = ?', [section_id])
monitor_db.action('UPDATE library_sections SET do_notify = 0 WHERE section_id = ?', [section_id])
monitor_db.action('UPDATE library_sections SET do_notify_created = 0 WHERE section_id = ?', [section_id])
library_cards = plexpy.CONFIG.HOME_LIBRARY_CARDS
if section_id in library_cards:
library_cards.remove(section_id)
plexpy.CONFIG.__setattr__('HOME_LIBRARY_CARDS', library_cards)
plexpy.CONFIG.write()
return 'Deleted library with id %s.' % section_id
else:
return 'Unable to delete library, section_id not valid.'
except Exception as e:
logger.warn(u"Tautulli Libraries :: Unable to execute database query for delete: %s." % e)
def undelete(self, section_id=None, section_name=None): def undelete(self, section_id=None, section_name=None):
monitor_db = database.MonitorDatabase() monitor_db = database.MonitorDatabase()

3
plexpy/users.py
View file

@ -684,7 +684,8 @@ class Users(object):
if purge_only: if purge_only:
return True return True
else: else:
logger.info(u"Tautulli Users :: Deleting user with user_id %s from database." % user_id) logger.info(u"Tautulli Users :: Deleting user with user_id %s from database."
% user_id)
try: try:
monitor_db.action('UPDATE users ' monitor_db.action('UPDATE users '
'SET deleted_user = 1, keep_history = 0, do_notify = 0 ' 'SET deleted_user = 1, keep_history = 0, do_notify = 0 '

52
plexpy/webserve.py
View file

@ -397,7 +397,7 @@ class WebInterface(object):
"do_notify_created": "Checked", "do_notify_created": "Checked",
"duration": 1578037, "duration": 1578037,
"guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en", "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
"id": 1128, "histroy_row_id": 1128,
"is_active": 1, "is_active": 1,
"keep_history": "Checked", "keep_history": "Checked",
"labels": [], "labels": [],
@ -414,9 +414,11 @@ class WebInterface(object):
"parent_title": "", "parent_title": "",
"plays": 772, "plays": 772,
"rating_key": 153037, "rating_key": 153037,
"row_id": 1,
"section_id": 2, "section_id": 2,
"section_name": "TV Shows", "section_name": "TV Shows",
"section_type": "Show", "section_type": "Show",
"server_id": "ds48g4r354a8v9byrrtr697g3g79w",
"thumb": "/library/metadata/153036/thumb/1462175062", "thumb": "/library/metadata/153036/thumb/1462175062",
"year": 2016 "year": 2016
}, },
@ -794,9 +796,11 @@ class WebInterface(object):
"library_art": "/:/resources/movie-fanart.jpg", "library_art": "/:/resources/movie-fanart.jpg",
"library_thumb": "/:/resources/movie.png", "library_thumb": "/:/resources/movie.png",
"parent_count": null, "parent_count": null,
"row_id": 1,
"section_id": 1, "section_id": 1,
"section_name": "Movies", "section_name": "Movies",
"section_type": "movie" "section_type": "movie",
"server_id": "ds48g4r354a8v9byrrtr697g3g79w"
} }
``` ```
""" """
@ -906,57 +910,59 @@ class WebInterface(object):
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def delete_all_library_history(self, section_id, **kwargs): def delete_all_library_history(self, server_id=None, section_id=None, row_ids=None, **kwargs):
""" Delete all Tautulli history for a specific library. """ Delete all Tautulli history for a specific library.
``` ```
Required parameters: Required parameters:
server_id (str): The Plex server identifier of the library section
section_id (str): The id of the Plex library section section_id (str): The id of the Plex library section
Optional parameters: Optional parameters:
None row_ids (str): Comma separated row ids to delete, e.g. "2,3,8"
Returns: Returns:
None None
``` ```
""" """
library_data = libraries.Libraries() if (server_id and section_id) or row_ids:
library_data = libraries.Libraries()
if section_id: success = library_data.delete(server_id=server_id, section_id=section_id, row_ids=row_ids, purge_only=True)
delete_row = library_data.delete_all_history(section_id=section_id) if success:
return {'result': 'success', 'message': 'Deleted library history.'}
if delete_row: else:
return {'message': delete_row} return {'result': 'error', 'message': 'Failed to delete library(s) history.'}
else: else:
return {'message': 'no data received'} return {'result': 'error', 'message': 'No server id and section id or row ids received.'}
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
@addtoapi() @addtoapi()
def delete_library(self, section_id, **kwargs): def delete_library(self, server_id=None, section_id=None, row_ids=None, **kwargs):
""" Delete a library section from Tautulli. Also erases all history for the library. """ Delete a library section from Tautulli. Also erases all history for the library.
``` ```
Required parameters: Required parameters:
server_id (str): The Plex server identifier of the library section
section_id (str): The id of the Plex library section section_id (str): The id of the Plex library section
Optional parameters: Optional parameters:
None row_ids (str): Comma separated row ids to delete, e.g. "2,3,8"
Returns: Returns:
None None
``` ```
""" """
library_data = libraries.Libraries() if (server_id and section_id) or row_ids:
library_data = libraries.Libraries()
if section_id: success = library_data.delete(server_id=server_id, section_id=section_id, row_ids=row_ids)
delete_row = library_data.delete(section_id=section_id) if success:
return {'result': 'success', 'message': 'Deleted library.'}
if delete_row: else:
return {'message': delete_row} return {'result': 'error', 'message': 'Failed to delete library(s).'}
else: else:
return {'message': 'no data received'} return {'result': 'error', 'message': 'No server id and section id or row ids received.'}
@cherrypy.expose @cherrypy.expose
@cherrypy.tools.json_out() @cherrypy.tools.json_out()
@ -1291,7 +1297,7 @@ class WebInterface(object):
"data": "data":
[{"friendly_name": "Jon Snow", [{"friendly_name": "Jon Snow",
"guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en", "guid": "com.plexapp.agents.thetvdb://121361/6/1?lang=en",
"history_row_id": 1121, "id": 1121,
"ip_address": "xxx.xxx.xxx.xxx", "ip_address": "xxx.xxx.xxx.xxx",
"last_played": "Game of Thrones - The Red Woman", "last_played": "Game of Thrones - The Red Woman",
"last_seen": 1462591869, "last_seen": 1462591869,