shpaq/Jackett-Jackett
1
0
Fork 0
mirror of https://github.com/Jackett/Jackett.git synced 2025-09-17 17:34:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

Gui: Add dropdown filters for Categories and Type (#11603)

Browse Source 
cleaned up the on load to clear previous filters when the modal was closed
This commit is contained in:
Wayne Dupree
2021-04-24 20:19:13 -05:00
committed by GitHub
parent 5ac8095741
commit d8d88962c6
2 changed files with 455 additions and 378 deletions
Download Patch File Download Diff File Expand all files Collapse all files

243
src/Jackett.Common/Content/custom.js
View File

@@ -4,8 +4,8 @@ var indexers = [];
var configuredIndexers = [];
var unconfiguredIndexers = [];
$.fn.inView = function() {
if(!this.length) return false;
$.fn.inView = function () {
if (!this.length) return false;
var rect = this.get(0).getBoundingClientRect();
return (
@@ -23,17 +23,19 @@ $.fn.focusWithoutScrolling = function () {
};
$(document).ready(function () {
$.ajaxSetup({ cache: false });
$.ajaxSetup({
cache: false
});
Handlebars.registerHelper('if_eq', function(a, b, opts) {
Handlebars.registerHelper('if_eq', function (a, b, opts) {
if (a == b)
return opts.fn(this);
else
return opts.inverse(this);
});
Handlebars.registerHelper('if_in', function(elem, list, opts) {
if(list.indexOf(elem) > -1) {
Handlebars.registerHelper('if_in', function (elem, list, opts) {
if (list.indexOf(elem) > -1) {
return opts.fn(this);
}
@@ -53,7 +55,7 @@ function openSearchIfNecessary() {
Object.assign({
[item.split('=')[0]]: (item.split('=').length < 2 ?
undefined :
decodeURIComponent(item.split('=')[1].replace(/\+/g,'%20')))
decodeURIComponent(item.split('=')[1].replace(/\+/g, '%20')))
}, prev), {});
if ("search" in hashArgs) {
showSearch(hashArgs.tracker, hashArgs.search, hashArgs.category);
@@ -147,20 +149,17 @@ function reloadIndexers() {
if (item.type == "public") {
item.type_label = "success";
}
else if (item.type == "private") {
} else if (item.type == "private") {
item.type_label = "danger";
}
else if (item.type == "semi-private") {
} else if (item.type == "semi-private") {
item.type_label = "warning";
}
else {
} else {
item.type_label = "default";
}
var main_cats_list = item.caps.filter(function(c) {
var main_cats_list = item.caps.filter(function (c) {
return c.ID < 100000;
}).map(function(c) {
}).map(function (c) {
return c.Name.split("/")[0];
});
item.mains_cats = $.unique(main_cats_list).join(", ");
@@ -180,21 +179,27 @@ function reloadIndexers() {
function displayConfiguredIndexersList(indexers) {
var indexersTemplate = Handlebars.compile($("#configured-indexer-table").html());
var indexersTable = $(indexersTemplate({ indexers: indexers, total_configured_indexers: indexers.length }));
var indexersTable = $(indexersTemplate({
indexers: indexers,
total_configured_indexers: indexers.length
}));
prepareTestButtons(indexersTable);
prepareSearchButtons(indexersTable);
prepareSetupButtons(indexersTable);
prepareDeleteButtons(indexersTable);
prepareCopyButtons(indexersTable);
indexersTable.find("table").dataTable(
{
indexersTable.find("table").dataTable({
"stateSave": true,
"stateDuration": 0,
"pageLength": -1,
"lengthMenu": [[10, 20, 50, 100, 250, 500, -1], [10, 20, 50, 100, 250, 500, "All"]],
"order": [[0, "asc"]],
"columnDefs": [
{
"lengthMenu": [
[10, 20, 50, 100, 250, 500, -1],
[10, 20, 50, 100, 250, 500, "All"]
],
"order": [
[0, "asc"]
],
"columnDefs": [{
"targets": 0,
"visible": true,
"searchable": true,
@@ -218,7 +223,10 @@ function displayUnconfiguredIndexersList() {
var UnconfiguredIndexersDialog = $($("#select-indexer").html());
var indexersTemplate = Handlebars.compile($("#unconfigured-indexer-table").html());
var indexersTable = $(indexersTemplate({ indexers: unconfiguredIndexers, total_unconfigured_indexers: unconfiguredIndexers.length }));
var indexersTable = $(indexersTemplate({
indexers: unconfiguredIndexers,
total_unconfigured_indexers: unconfiguredIndexers.length
}));
indexersTable.find('.indexer-setup').each(function (i, btn) {
var indexer = unconfiguredIndexers[i];
$(btn).click(function () {
@@ -247,7 +255,7 @@ function displayUnconfiguredIndexersList() {
doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
}
}).fail(function (data) {
if(data.responseJSON.error !== undefined) {
if (data.responseJSON.error !== undefined) {
var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
var githubrepo = "Jackett/Jackett";
var githubtext = "this indexer";
@@ -264,25 +272,36 @@ function displayUnconfiguredIndexersList() {
});
});
});
indexersTable.find("table").DataTable(
{
indexersTable.find("table").DataTable({
initComplete: function () {
this.api().columns().every(function () {
var currentTable = this;
this.api().columns().every(function (index, i, j) {
var column = this;
var headerText = column.header().innerText;
if (headerText == 'Language') {
var select = $('<select><option value="">Show all</option></select>')
.appendTo($(column.footer()).empty())
.on('change', function () {
var val = $.fn.dataTable.util.escapeRegex(
$(this).val()
);
if (headerText == 'Type') {
var select = createDropDownHtml(column, true);
column
.search(val ? '^' + val + '$' : '', true, false)
.draw();
var columnData = currentTable.api().columns(index + 1).data();
var distinctValues = [...new Set(columnData[0])];
distinctValues.forEach(function (distinctVal) {
select.append('<option value="' + distinctVal + '">' + distinctVal.replace(/^\w/, (c) => c.toUpperCase()) + '</option>')
});
} else if (headerText == 'Categories') {
var select = createDropDownHtml(column, false);
var columnData = [];
column.data().unique().each(function (d, j) {
d.split(',').forEach(function (val) {
columnData.push(val.trim());
});
});
var distinctValues = [...new Set(columnData)];
distinctValues.sort().forEach(function (distinctVal) {
select.append('<option value="' + distinctVal + '">' + distinctVal + '</option>')
});
} else if (headerText == 'Language') {
var select = createDropDownHtml(column, true);
column.data().unique().sort().each(function (d, j) {
select.append('<option value="' + d + '">' + d + '</option>')
@@ -300,10 +319,14 @@ function displayUnconfiguredIndexersList() {
},
"bAutoWidth": false,
"pageLength": -1,
"lengthMenu": [[10, 20, 50, 100, 250, 500, -1], [10, 20, 50, 100, 250, 500, "All"]],
"order": [[0, "asc"]],
"columnDefs": [
{
"lengthMenu": [
[10, 20, 50, 100, 250, 500, -1],
[10, 20, 50, 100, 250, 500, "All"]
],
"order": [
[0, "asc"]
],
"columnDefs": [{
"name": "name",
"targets": 0,
"visible": true,
@@ -342,7 +365,7 @@ function displayUnconfiguredIndexersList() {
"name": "buttons",
"targets": 5,
"visible": true,
"searchable" : false,
"searchable": false,
"orderable": false
}
]
@@ -351,7 +374,7 @@ function displayUnconfiguredIndexersList() {
var undefindexers = UnconfiguredIndexersDialog.find('#unconfigured-indexers');
undefindexers.append(indexersTable);
UnconfiguredIndexersDialog.on('shown.bs.modal', function() {
UnconfiguredIndexersDialog.on('shown.bs.modal', function () {
$(this).find('div.dataTables_filter input').focusWithoutScrolling();
});
@@ -364,6 +387,28 @@ function displayUnconfiguredIndexersList() {
UnconfiguredIndexersDialog.modal("show");
}
function createDropDownHtml(column, exactMatch) {
var select = $('<select><option value="">Show all</option></select>')
.appendTo($(column.footer()).empty())
.on('change', function () {
var val = $.fn.dataTable.util.escapeRegex(
$(this).val()
);
if (exactMatch) {
column
.search(val ? '^' + val + '$' : '', true, false)
.draw();
} else {
column
.search(val ? val : '', true, false)
.draw();
}
});
return select;
}
function copyToClipboard(text) {
// create hidden text element, if it doesn't already exist
var targetId = "_hiddenCopyText_";
@@ -437,7 +482,7 @@ function prepareSearchButtons(element) {
element.find('.indexer-button-search').each(function (i, btn) {
var $btn = $(btn);
var id = $btn.data("id");
$btn.click(function() {
$btn.click(function () {
window.location.hash = "search&tracker=" + id;
showSearch(id);
});
@@ -453,9 +498,8 @@ function prepareSetupButtons(element) {
});
}
function updateTestState(id, state, message, parent)
{
var btn = parent.find(".indexer-button-test[data-id=" +id + "]");
function updateTestState(id, state, message, parent) {
var btn = parent.find(".indexer-button-test[data-id=" + id + "]");
var sortmsg = message;
if (!sortmsg || state == "success")
@@ -468,7 +512,9 @@ function updateTestState(id, state, message, parent)
if (message) {
btn.tooltip("hide");
btn.attr("title", message);
btn.data('bs.tooltip', false).tooltip({ title: message });
btn.data('bs.tooltip', false).tooltip({
title: message
});
}
var icon = btn.find("span");
@@ -481,7 +527,10 @@ function updateTestState(id, state, message, parent)
} else if (state == "inprogres") {
icon.addClass("glyphicon-refresh test-inprogres spinner");
}
var dt = $.fn.dataTable.tables({ visible: true, api: true}).rows().invalidate('dom');
var dt = $.fn.dataTable.tables({
visible: true,
api: true
}).rows().invalidate('dom');
if (state != "inprogres")
dt.draw();
}
@@ -504,7 +553,7 @@ function testIndexer(id, notifyResult) {
}
}).fail(function (data) {
updateTestState(id, "error", data.error, indexers);
if(data.responseJSON.error !== undefined && notifyResult) {
if (data.responseJSON.error !== undefined && notifyResult) {
var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - id.length - "] ".length - " (Test)".length; // keep url <= 2k #5104
var githubrepo = "Jackett/Jackett";
var githubtext = "this indexer";
@@ -568,13 +617,20 @@ function populateConfigItems(configForm, config) {
function newConfigModal(title, config, caps, link, alternativesitelinks, description) {
var configTemplate = Handlebars.compile($("#jackett-config-setup-modal").html());
var configForm = $(configTemplate({ title: title, caps: caps, link: link, description: description }));
var configForm = $(configTemplate({
title: title,
caps: caps,
link: link,
description: description
}));
$("#modals").append(configForm);
populateConfigItems(configForm, config);
if (alternativesitelinks.length >= 1) {
var AlternativeSiteLinksTemplate = Handlebars.compile($("#setup-item-alternativesitelinks").html());
var template = $(AlternativeSiteLinksTemplate({ "alternativesitelinks": alternativesitelinks }));
var template = $(AlternativeSiteLinksTemplate({
"alternativesitelinks": alternativesitelinks
}));
configForm.find("div[data-id='sitelink']").after(template);
template.find("a.alternativesitelink").click(function (a) {
$("div[data-id='sitelink'] input").val(this.href);
@@ -591,7 +647,9 @@ function getConfigModalJson(configForm) {
$el = $(el);
var type = $el.data("type");
var id = $el.data("id");
var itemEntry = { id: id };
var itemEntry = {
id: id
};
switch (type) {
case "hiddendata":
itemEntry.value = $el.find(".setup-item-hiddendata input").val();
@@ -641,7 +699,7 @@ function populateSetupForm(indexerId, name, config, caps, link, alternativesitel
doNotify("Configuration failed: " + data.error, "danger", "glyphicon glyphicon-alert");
}
}).fail(function (data) {
if(data.responseJSON.error !== undefined) {
if (data.responseJSON.error !== undefined) {
var indexEnd = 2048 - "https://github.com/Jackett/Jackett/issues/new?title=[".length - indexerId.length - "] ".length - " (Config)".length; // keep url <= 2k #5104
doNotify("An error occurred while updating this indexer<br /><b>" + data.responseJSON.error.substring(0, indexEnd) + "</b><br /><i><a href=\"https://github.com/Jackett/Jackett/issues/new?title=[" + indexerId + "] " + data.responseJSON.error.substring(0, indexEnd) + " (Config)\" target=\"_blank\">Click here to open an issue on GitHub for this indexer.</a><i>", "danger", "glyphicon glyphicon-alert", false);
} else {
@@ -696,8 +754,7 @@ function clearNotifications() {
$('[data-notify="container"]').remove();
}
function updateReleasesRow(row)
{
function updateReleasesRow(row) {
var labels = $(row).find("span.release-labels");
var TitleLink = $(row).find("td.Title > a");
var IMDBId = $(row).data("imdb");
@@ -764,7 +821,7 @@ function showSearch(selectedIndexer, query, category) {
releaseDialog.on('hidden.bs.modal', function (e) {
$('#indexers div.dataTables_filter input').focusWithoutScrolling();
window.location.hash = '';
}) ;
});
var setCategories = function (trackers, items) {
var cats = {};
@@ -781,7 +838,10 @@ function showSearch(selectedIndexer, query, category) {
var selected = select.val();
var options = []
$.each(cats, function (ID, Name) {
options.push({ label: ID + ' (' + Name + ')', value: ID });
options.push({
label: ID + ' (' + Name + ')',
value: ID
});
});
select.multiselect('dataprovider', options);
select.val(selected).multiselect("refresh");
@@ -790,7 +850,9 @@ function showSearch(selectedIndexer, query, category) {
$('#searchTracker').change(jQuery.proxy(function () {
var trackerIds = $('#searchTracker').val();
setCategories(trackerIds, this.items);
}, { items: configuredIndexers }));
}, {
items: configuredIndexers
}));
var queryField = document.getElementById("searchquery");
queryField.addEventListener("keyup", function (event) {
@@ -814,7 +876,7 @@ function showSearch(selectedIndexer, query, category) {
};
window.location.hash = Object.entries({
search: encodeURIComponent(queryObj.Query).replace(/%20/g,'+'),
search: encodeURIComponent(queryObj.Query).replace(/%20/g, '+'),
tracker: queryObj.Tracker.join(","),
category: queryObj.Category.join(",")
}).map(([k, v], i) => k + '=' + v).join('&');
@@ -905,10 +967,13 @@ $.fn.dataTable.ext.search = [
function updateSearchResultTable(element, results) {
var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
element.html($(resultsTemplate(results)));
element.find('tr.jackett-search-results-row').each(function () { updateReleasesRow(this); });
var settings = { "deadfilter": true };
var datatable = element.find('table').DataTable(
{
element.find('tr.jackett-search-results-row').each(function () {
updateReleasesRow(this);
});
var settings = {
"deadfilter": true
};
var datatable = element.find('table').DataTable({
"fnStateSaveParams": function (oSettings, sValue) {
sValue.search.search = ""; // don't save the search filter content
sValue.deadfilter = settings.deadfilter;
@@ -924,10 +989,14 @@ function updateSearchResultTable(element, results) {
"stateDuration": 0,
"bAutoWidth": false,
"pageLength": 20,
"lengthMenu": [[10, 20, 50, 100, 250, 500, -1], [10, 20, 50, 100, 250, 500, "All"]],
"order": [[0, "desc"]],
"columnDefs": [
{
"lengthMenu": [
[10, 20, 50, 100, 250, 500, -1],
[10, 20, 50, 100, 250, 500, "All"]
],
"order": [
[0, "desc"]
],
"columnDefs": [{
"targets": 0,
"visible": false,
"searchable": false,
@@ -964,7 +1033,7 @@ function updateSearchResultTable(element, results) {
newInputSearch.on("input", function () {
var newKeywords = [];
var filterTextKeywords = $(this).val().split(" ");
$.each(filterTextKeywords, function(index, keyword) {
$.each(filterTextKeywords, function (index, keyword) {
if (keyword === "" || keyword === "+" || keyword === "-")
return;
var newKeyword;
@@ -985,8 +1054,7 @@ function updateSearchResultTable(element, results) {
var deadfilterdiv = element.find(".dataTables_deadfilter");
var deadfiltercheckbox = deadfilterdiv.find("input");
if (!deadfiltercheckbox.length) {
deadfilterlabel = $('<label><input type="checkbox" id="jackett-search-results-datatable_deadfilter_checkbox" value="1"> Show dead torrents</label>'
);
deadfilterlabel = $('<label><input type="checkbox" id="jackett-search-results-datatable_deadfilter_checkbox" value="1"> Show dead torrents</label>');
deadfilterdiv.append(deadfilterlabel);
deadfiltercheckbox = deadfilterlabel.find("input");
deadfiltercheckbox.on("change", function () {
@@ -1049,6 +1117,7 @@ function bindUIButtons() {
$("#modals").empty();
displayUnconfiguredIndexersList();
$('#unconfigured-indexer-datatable tfoot tr').insertAfter($('#unconfigured-indexer-datatable thead tr'));
$('#unconfigured-indexer-datatable').DataTable().search('').columns().search('').draw();
});
$("#jackett-test-all").click(function () {
@@ -1067,24 +1136,32 @@ function bindUIButtons() {
item.CategoryDesc = insertWordWrap(item.CategoryDesc);
}
var releaseTemplate = Handlebars.compile($("#jackett-releases").html());
var item = { releases: data, Title: 'Releases' };
var item = {
releases: data,
Title: 'Releases'
};
var releaseDialog = $(releaseTemplate(item));
var table = releaseDialog.find('table');
releaseDialog.find('tr.jackett-releases-row').each(function () { updateReleasesRow(this); });
releaseDialog.find('tr.jackett-releases-row').each(function () {
updateReleasesRow(this);
});
releaseDialog.on('hidden.bs.modal', function (e) {
$('#indexers div.dataTables_filter input').focusWithoutScrolling();
});
table.DataTable(
{
table.DataTable({
"stateSave": true,
"stateDuration": 0,
"bAutoWidth": false,
"pageLength": 20,
"lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]],
"order": [[0, "desc"]],
"columnDefs": [
{
"lengthMenu": [
[10, 20, 50, -1],
[10, 20, 50, "All"]
],
"order": [
[0, "desc"]
],
"columnDefs": [{
"targets": 0,
"visible": false,
"searchable": false,
@@ -1161,7 +1238,9 @@ function bindUIButtons() {
$("#view-jackett-logs").click(function () {
api.getServerLogs(function (data) {
var releaseTemplate = Handlebars.compile($("#jackett-logs").html());
var item = { logs: data };
var item = {
logs: data
};
var releaseDialog = $(releaseTemplate(item));
$("#modals").append(releaseDialog);
releaseDialog.modal("show");
@@ -1266,9 +1345,7 @@ function bindUIButtons() {
function proxyWarning(input) {
if (input != null && input.toString().trim() !== "-1") { // disabled = -1
$('#proxy-warning').show();
}
else
{
} else {
$('#proxy-warning').hide();
}
}

2
src/Jackett.Common/Content/index.html
View File

@@ -698,6 +698,6 @@
</script>
<script type="text/javascript" src="../libs/api.js?changed=2017083001"></script>
<script type="text/javascript" src="../custom.js?changed=20210423"></script>
<script type="text/javascript" src="../custom.js?changed=20210424"></script>
</body>
</html>