diff --git a/src/Jackett/Content/custom.css b/src/Jackett/Content/custom.css
index 15be6631f..eee760e09 100644
--- a/src/Jackett/Content/custom.css
+++ b/src/Jackett/Content/custom.css
@@ -20,69 +20,25 @@
display: none;
}
-.card {
- background-color: #f9f9f9;
- border-radius: 6px;
- box-shadow: 1px 1px 5px 2px #cdcdcd;
- width: 270px;
- display: inline-block;
- vertical-align: top;
- margin: 5px;
- overflow: hidden;
- position: relative;
-}
-
#indexers {
text-align: center;
margin-top: 30px;
}
-
-#unconfigured-indexers{
- text-align: center;
+.indexer-table {
+ text-align: left;
}
-#unconfigured-indexers .card {
- width: 200px;
- position: relative;
+.test-success {
+ color: #449d44;
}
-.unconfigured-indexer {
- height: 70px;
+.test-error {
+ color: #c9302c;
}
-
-
-.indexer {
- height: 252px;
-}
-
-.add-indexer {
- border: 0;
-}
-
-.indexer-logo {
- padding-bottom: 5px;
-}
-
-.indexer-logo > .hidden-name {
- position: absolute;
- color: rgba(255, 255, 255, 0);
- left: 0;
-}
-
-.indexer-logo img {
- width: 100%;
- border-bottom: 1px solid #FFF;
-}
-
-#unconfigured-indexers .indexer-logo img {
- cursor: pointer;
-}
-
-.indexer-name > h3 {
- margin-top: 13px;
- text-align: center;
+.test-inprogress {
+ color: #286090;
}
.indexer-buttons {
@@ -94,33 +50,7 @@
}
.indexer-button-test {
- width: 60px;
-}
-
-.indexer-add-content {
- color: gray;
- text-align: center;
-}
-
- .indexer-add-content > .glyphicon {
- font-size: 50px;
- vertical-align: bottom;
- }
-
- .indexer-add-content > .light-text {
- margin-top: 11px;
- font-size: 18px;
- margin-left: -5px;
- }
-
-.indexer-host {
- padding-left: 5px;
- padding-right: 5px;
-}
-
-.indexer-host > input {
- font-size: 12px;
- padding: 2px;
+ width: 60px;
}
.setup-item-inputstring {
@@ -297,3 +227,8 @@ pre {
display: none;
}
+.table td.fit{
+ white-space: nowrap;
+ width: 1%;
+}
+
diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js
index 582f90fb3..8ec164b8b 100644
--- a/src/Jackett/Content/custom.js
+++ b/src/Jackett/Content/custom.js
@@ -47,54 +47,149 @@ function loadJackettSettings() {
function reloadIndexers() {
$('#indexers').hide();
- $('#indexers > .indexer').remove();
- $('#unconfigured-indexers').empty();
var jqxhr = $.get("get_indexers", function (data) {
- displayIndexers(data.items);
+ var configuredIndexers = [];
+ var unconfiguredIndexers = [];
+ for (var i = 0; i < data.items.length; i++) {
+ var item = data.items[i];
+ item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id);
+ item.potato_host = resolveUrl(basePath + "/potato/" + item.id);
+
+ if (item.last_error)
+ item.state = "error";
+ else
+ item.state = "success";
+
+ item.main_cats_list = [];
+ for (var catID in item.caps) {
+ var isMainCat = (catID % 1000) == 0;
+ if (isMainCat)
+ item.main_cats_list.push(item.caps[catID]);
+ }
+ item.mains_cats = item.main_cats_list.join(", ");
+
+ if (item.configured)
+ configuredIndexers.push(item);
+ else
+ unconfiguredIndexers.push(item);
+ }
+ displayConfiguredIndexersList(configuredIndexers);
+ displayUnconfiguredIndexersList(unconfiguredIndexers);
}).fail(function () {
doNotify("Error loading indexers, request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
});
}
-function displayIndexers(items) {
- var indexerTemplate = Handlebars.compile($("#configured-indexer").html());
- var unconfiguredIndexerTemplate = Handlebars.compile($("#unconfigured-indexer").html());
- $('#unconfigured-indexers-template').empty();
- for (var i = 0; i < items.length; i++) {
- var item = items[i];
- item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id);
- item.potato_host = resolveUrl(basePath + "/potato/" + item.id);
- if (item.configured)
- $('#indexers').append(indexerTemplate(item));
- else
- $('#unconfigured-indexers-template').append($(unconfiguredIndexerTemplate(item)));
- }
-
- var addIndexerButton = $($('#add-indexer').html());
- addIndexerButton.appendTo($('#indexers'));
-
- addIndexerButton.click(function () {
- $("#modals").empty();
- var dialog = $($("#select-indexer").html());
- dialog.find('#unconfigured-indexers').html($('#unconfigured-indexers-template').html());
- $("#modals").append(dialog);
- dialog.modal("show");
- $('.indexer-setup').each(function (i, btn) {
- var $btn = $(btn);
- var id = $btn.data("id");
- var link = $btn.data("link");
- $btn.click(function () {
- $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
- displayIndexerSetup(id, link);
- });
- });
- });
- });
-
+function displayConfiguredIndexersList(indexers) {
+ var indexersTemplate = Handlebars.compile($("#configured-indexer-table").html());
+ var indexersTable = $(indexersTemplate({ indexers: indexers }));
+ indexersTable.find('table').DataTable(
+ {
+ "pageLength": 100,
+ "lengthMenu": [[10, 20, 50, 100, 200, -1], [10, 20, 50, 100, 200, "All"]],
+ "order": [[0, "desc"]],
+ "columnDefs": [
+ {
+ "targets": 0,
+ "visible": true,
+ "searchable": true
+ },
+ {
+ "targets": 1,
+ "visible": true,
+ "searchable": false
+ }
+ ]
+ });
+
+ $('#indexers').empty();
+ $('#indexers').append(indexersTable);
+ prepareTestButtons();
$('#indexers').fadeIn();
prepareSetupButtons();
- prepareTestButtons();
prepareDeleteButtons();
+ prepareCopyButtons();
+}
+
+function displayUnconfiguredIndexersList(indexers) {
+ var indexersTemplate = Handlebars.compile($("#unconfigured-indexer-table").html());
+ var indexersTable = $(indexersTemplate({ indexers: indexers }));
+ indexersTable.find('table').DataTable(
+ {
+ "pageLength": 100,
+ "lengthMenu": [[10, 20, 50, 100, 200, -1], [10, 20, 50, 100, 200, "All"]],
+ "order": [[0, "desc"]],
+ "columnDefs": [
+ {
+ "targets": 0,
+ "visible": true,
+ "searchable": true
+ },
+ {
+ "targets": 1,
+ "visible": true,
+ "searchable": true
+ },
+ {
+ "targets": 2,
+ "visible": true,
+ "searchable": true
+ },
+ {
+ "targets": 3,
+ "visible": true,
+ "searchable": false
+ }
+ ]
+ });
+ $('#unconfigured-indexers-template').empty();
+ $('#unconfigured-indexers-template').append(indexersTable);
+}
+
+function copyToClipboard(text) {
+ // create hidden text element, if it doesn't already exist
+ var targetId = "_hiddenCopyText_";
+ // must use a temporary form element for the selection and copy
+ target = document.getElementById(targetId);
+ if (!target) {
+ var target = document.createElement("textarea");
+ target.style.position = "absolute";
+ target.style.left = "-9999px";
+ target.style.top = "0";
+ target.id = targetId;
+ document.body.appendChild(target);
+ }
+ target.textContent = text;
+ // select the content
+ var currentFocus = document.activeElement;
+ target.focus();
+ target.setSelectionRange(0, target.value.length);
+
+ // copy the selection
+ var succeed;
+ try {
+ succeed = document.execCommand("copy");
+ } catch (e) {
+ succeed = false;
+ }
+ // restore original focus
+ if (currentFocus && typeof currentFocus.focus === "function") {
+ currentFocus.focus();
+ }
+
+ target.textContent = "";
+
+ return succeed;
+}
+
+function prepareCopyButtons() {
+ $(".indexer-button-copy").each(function (i, btn) {
+ var $btn = $(btn);
+ var title = $btn[0].title;
+ $btn.click(function () {
+ copyToClipboard(title);
+ });
+ });
}
function prepareDeleteButtons() {
@@ -129,22 +224,55 @@ function prepareSetupButtons() {
});
}
+function updateTestState(id, state, message)
+{
+ var btn = $(".indexer-button-test[data-id=" + id + "]");
+ if (message) {
+ btn.tooltip("hide");
+ btn.data('bs.tooltip', false).tooltip({ title: message });
+ }
+ var icon = btn.find("span");
+ icon.removeClass("glyphicon-ok test-success glyphicon-alert test-error glyphicon-refresh spinner test-inprogres");
+
+ if (state == "success") {
+ icon.addClass("glyphicon-ok test-success");
+ } else if (state == "error") {
+ icon.addClass("glyphicon-alert test-error");
+ } else if (state == "inprogres") {
+ icon.addClass("glyphicon-refresh test-inprogres spinner");
+ }
+}
+
+function testIndexer(id, notifyResult) {
+ updateTestState(id, "inprogres", null);
+
+ if (notifyResult)
+ doNotify("Test started for " + id, "info", "glyphicon glyphicon-transfer");
+ var jqxhr = $.post("test_indexer", JSON.stringify({ indexer: id }), function (data) {
+ if (data.result == "error") {
+ updateTestState(id, "error", data.error);
+ if (notifyResult)
+ doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
+ }
+ else {
+ updateTestState(id, "success", "Test successful");
+ if (notifyResult)
+ doNotify("Test successful for " + id, "success", "glyphicon glyphicon-ok");
+ }
+ }).fail(function () {
+ doNotify("Error testing indexer, request to Jackett server error", "danger", "glyphicon glyphicon-alert");
+ });
+}
+
function prepareTestButtons() {
$(".indexer-button-test").each(function (i, btn) {
var $btn = $(btn);
var id = $btn.data("id");
+ var state = $btn.data("state");
+ $btn.tooltip();
+ updateTestState(id, state, null);
$btn.click(function () {
- doNotify("Test started for " + id, "info", "glyphicon glyphicon-transfer");
- var jqxhr = $.post("test_indexer", JSON.stringify({ indexer: id }), function (data) {
- if (data.result == "error") {
- doNotify("Test failed for " + id + ": \n" + data.error, "danger", "glyphicon glyphicon-alert");
- }
- else {
- doNotify("Test successful for " + id, "success", "glyphicon glyphicon-ok");
- }
- }).fail(function () {
- doNotify("Error testing indexer, request to Jackett server error", "danger", "glyphicon glyphicon-alert");
- });
+ testIndexer(id, true);
});
});
}
@@ -393,6 +521,32 @@ function bindUIButtons() {
return false;
});
+ $('#jackett-add-indexer').click(function () {
+ $("#modals").empty();
+ var dialog = $($("#select-indexer").html());
+ dialog.find('#unconfigured-indexers').html($('#unconfigured-indexers-template').html());
+ $("#modals").append(dialog);
+ dialog.modal("show");
+ $('.indexer-setup').each(function (i, btn) {
+ var $btn = $(btn);
+ var id = $btn.data("id");
+ var link = $btn.data("link");
+ $btn.click(function () {
+ $('#select-indexer-modal').modal('hide').on('hidden.bs.modal', function (e) {
+ displayIndexerSetup(id, link);
+ });
+ });
+ });
+ });
+
+ $("#jackett-test-all").click(function () {
+ $(".indexer-button-test").each(function (i, btn) {
+ var $btn = $(btn);
+ var id = $btn.data("id");
+ testIndexer(id, false);
+ });
+ });
+
$("#jackett-show-releases").click(function () {
var jqxhr = $.get("GetCache", function (data) {
var releaseTemplate = Handlebars.compile($("#jackett-releases").html());
diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html
index ac7f5bb85..43b477271 100644
--- a/src/Jackett/Content/index.html
+++ b/src/Jackett/Content/index.html
@@ -32,11 +32,17 @@
+
+
Configured Indexers
@@ -170,49 +176,83 @@
-
-
-
+
diff --git a/src/Jackett/Content/logos/abnormal.png b/src/Jackett/Content/logos/abnormal.png
deleted file mode 100644
index c8e47e02a..000000000
Binary files a/src/Jackett/Content/logos/abnormal.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/alpharatio.png b/src/Jackett/Content/logos/alpharatio.png
deleted file mode 100644
index 740181d25..000000000
Binary files a/src/Jackett/Content/logos/alpharatio.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/alphareign.png b/src/Jackett/Content/logos/alphareign.png
deleted file mode 100644
index f3975034f..000000000
Binary files a/src/Jackett/Content/logos/alphareign.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/andraste.png b/src/Jackett/Content/logos/andraste.png
deleted file mode 100644
index 2ca04c2ed..000000000
Binary files a/src/Jackett/Content/logos/andraste.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/animebytes.png b/src/Jackett/Content/logos/animebytes.png
deleted file mode 100644
index 82c9dad13..000000000
Binary files a/src/Jackett/Content/logos/animebytes.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/animetorrents.png b/src/Jackett/Content/logos/animetorrents.png
deleted file mode 100644
index 24c836e4b..000000000
Binary files a/src/Jackett/Content/logos/animetorrents.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/apollo.png b/src/Jackett/Content/logos/apollo.png
deleted file mode 100644
index 1d25c0312..000000000
Binary files a/src/Jackett/Content/logos/apollo.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/avistaz.png b/src/Jackett/Content/logos/avistaz.png
deleted file mode 100644
index 1100ed133..000000000
Binary files a/src/Jackett/Content/logos/avistaz.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bakabt.png b/src/Jackett/Content/logos/bakabt.png
deleted file mode 100644
index b0761f625..000000000
Binary files a/src/Jackett/Content/logos/bakabt.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bb.png b/src/Jackett/Content/logos/bb.png
deleted file mode 100644
index 6fcb9b719..000000000
Binary files a/src/Jackett/Content/logos/bb.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bestfriends.png b/src/Jackett/Content/logos/bestfriends.png
deleted file mode 100644
index 1c5edcb45..000000000
Binary files a/src/Jackett/Content/logos/bestfriends.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/beyondhd.png b/src/Jackett/Content/logos/beyondhd.png
deleted file mode 100644
index 52cc4f383..000000000
Binary files a/src/Jackett/Content/logos/beyondhd.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bitcityreloaded.png b/src/Jackett/Content/logos/bitcityreloaded.png
deleted file mode 100644
index fbb4ffae5..000000000
Binary files a/src/Jackett/Content/logos/bitcityreloaded.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bithdtv.png b/src/Jackett/Content/logos/bithdtv.png
deleted file mode 100644
index bb6925e48..000000000
Binary files a/src/Jackett/Content/logos/bithdtv.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bitmetv.png b/src/Jackett/Content/logos/bitmetv.png
deleted file mode 100644
index 81b0c492a..000000000
Binary files a/src/Jackett/Content/logos/bitmetv.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bitsoup.png b/src/Jackett/Content/logos/bitsoup.png
deleted file mode 100644
index 65c0459e1..000000000
Binary files a/src/Jackett/Content/logos/bitsoup.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/bjshare.png b/src/Jackett/Content/logos/bjshare.png
deleted file mode 100644
index 061c91b6e..000000000
Binary files a/src/Jackett/Content/logos/bjshare.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/blubits.png b/src/Jackett/Content/logos/blubits.png
deleted file mode 100644
index f32d6cc76..000000000
Binary files a/src/Jackett/Content/logos/blubits.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/broadcastthenet.png b/src/Jackett/Content/logos/broadcastthenet.png
deleted file mode 100644
index d9917acd6..000000000
Binary files a/src/Jackett/Content/logos/broadcastthenet.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/cinemaz.png b/src/Jackett/Content/logos/cinemaz.png
deleted file mode 100644
index d99b1ff6d..000000000
Binary files a/src/Jackett/Content/logos/cinemaz.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/danishbits.png b/src/Jackett/Content/logos/danishbits.png
deleted file mode 100644
index 9885fddf2..000000000
Binary files a/src/Jackett/Content/logos/danishbits.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/demonoid.png b/src/Jackett/Content/logos/demonoid.png
deleted file mode 100644
index 2c48c0848..000000000
Binary files a/src/Jackett/Content/logos/demonoid.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/digitalhive.png b/src/Jackett/Content/logos/digitalhive.png
deleted file mode 100644
index 13d982e2a..000000000
Binary files a/src/Jackett/Content/logos/digitalhive.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/eotforum.png b/src/Jackett/Content/logos/eotforum.png
deleted file mode 100644
index 871045d16..000000000
Binary files a/src/Jackett/Content/logos/eotforum.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/ethor.png b/src/Jackett/Content/logos/ethor.png
deleted file mode 100644
index 905e0df2b..000000000
Binary files a/src/Jackett/Content/logos/ethor.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/filelist.png b/src/Jackett/Content/logos/filelist.png
deleted file mode 100644
index 50a09284a..000000000
Binary files a/src/Jackett/Content/logos/filelist.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/freakstrackingsystem.png b/src/Jackett/Content/logos/freakstrackingsystem.png
deleted file mode 100644
index 719e17e85..000000000
Binary files a/src/Jackett/Content/logos/freakstrackingsystem.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/freshon.png b/src/Jackett/Content/logos/freshon.png
deleted file mode 100644
index 1b3e8f42d..000000000
Binary files a/src/Jackett/Content/logos/freshon.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/funfile.png b/src/Jackett/Content/logos/funfile.png
deleted file mode 100644
index a6a595bcd..000000000
Binary files a/src/Jackett/Content/logos/funfile.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/fuzer.png b/src/Jackett/Content/logos/fuzer.png
deleted file mode 100644
index 19d41c525..000000000
Binary files a/src/Jackett/Content/logos/fuzer.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/gftracker.png b/src/Jackett/Content/logos/gftracker.png
deleted file mode 100644
index 126d34bf9..000000000
Binary files a/src/Jackett/Content/logos/gftracker.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/ghostcity.png b/src/Jackett/Content/logos/ghostcity.png
deleted file mode 100644
index fb6915cd4..000000000
Binary files a/src/Jackett/Content/logos/ghostcity.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/hd4free.png b/src/Jackett/Content/logos/hd4free.png
deleted file mode 100644
index d3c989f57..000000000
Binary files a/src/Jackett/Content/logos/hd4free.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/hdme.png b/src/Jackett/Content/logos/hdme.png
deleted file mode 100644
index bccbaf55b..000000000
Binary files a/src/Jackett/Content/logos/hdme.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/hdspace.png b/src/Jackett/Content/logos/hdspace.png
deleted file mode 100644
index c1555963d..000000000
Binary files a/src/Jackett/Content/logos/hdspace.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/hdtorrents.png b/src/Jackett/Content/logos/hdtorrents.png
deleted file mode 100644
index 30a4ffcb6..000000000
Binary files a/src/Jackett/Content/logos/hdtorrents.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/hebits.png b/src/Jackett/Content/logos/hebits.png
deleted file mode 100644
index 5d9298e8a..000000000
Binary files a/src/Jackett/Content/logos/hebits.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/hounddawgs.png b/src/Jackett/Content/logos/hounddawgs.png
deleted file mode 100644
index 3ff6f87b7..000000000
Binary files a/src/Jackett/Content/logos/hounddawgs.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/houseoftorrents.png b/src/Jackett/Content/logos/houseoftorrents.png
deleted file mode 100644
index fffa0e550..000000000
Binary files a/src/Jackett/Content/logos/houseoftorrents.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/ilovetorrents.png b/src/Jackett/Content/logos/ilovetorrents.png
deleted file mode 100644
index b85a68bac..000000000
Binary files a/src/Jackett/Content/logos/ilovetorrents.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/immortalseed.png b/src/Jackett/Content/logos/immortalseed.png
deleted file mode 100644
index 7a466dec6..000000000
Binary files a/src/Jackett/Content/logos/immortalseed.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/iptorrents.png b/src/Jackett/Content/logos/iptorrents.png
deleted file mode 100644
index 8790a508a..000000000
Binary files a/src/Jackett/Content/logos/iptorrents.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/morethantv.png b/src/Jackett/Content/logos/morethantv.png
deleted file mode 100644
index 5a8dc7df6..000000000
Binary files a/src/Jackett/Content/logos/morethantv.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/myamity.png b/src/Jackett/Content/logos/myamity.png
deleted file mode 100644
index db0115a8c..000000000
Binary files a/src/Jackett/Content/logos/myamity.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/myanonamouse.png b/src/Jackett/Content/logos/myanonamouse.png
deleted file mode 100644
index af1b9d383..000000000
Binary files a/src/Jackett/Content/logos/myanonamouse.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/ncore.png b/src/Jackett/Content/logos/ncore.png
deleted file mode 100644
index 1fcab1966..000000000
Binary files a/src/Jackett/Content/logos/ncore.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/newrealworld.png b/src/Jackett/Content/logos/newrealworld.png
deleted file mode 100644
index 03e00bd38..000000000
Binary files a/src/Jackett/Content/logos/newrealworld.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/newretro.png b/src/Jackett/Content/logos/newretro.png
deleted file mode 100644
index a88f2574e..000000000
Binary files a/src/Jackett/Content/logos/newretro.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/passthepopcorn.png b/src/Jackett/Content/logos/passthepopcorn.png
deleted file mode 100644
index dd5bab04e..000000000
Binary files a/src/Jackett/Content/logos/passthepopcorn.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/piratethenet.png b/src/Jackett/Content/logos/piratethenet.png
deleted file mode 100644
index c622a89eb..000000000
Binary files a/src/Jackett/Content/logos/piratethenet.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/pretome.png b/src/Jackett/Content/logos/pretome.png
deleted file mode 100644
index e42ca78fa..000000000
Binary files a/src/Jackett/Content/logos/pretome.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/privatehd.png b/src/Jackett/Content/logos/privatehd.png
deleted file mode 100644
index 2b174909b..000000000
Binary files a/src/Jackett/Content/logos/privatehd.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/revolutiontt.png b/src/Jackett/Content/logos/revolutiontt.png
deleted file mode 100644
index b674732c1..000000000
Binary files a/src/Jackett/Content/logos/revolutiontt.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/sceneaccess.png b/src/Jackett/Content/logos/sceneaccess.png
deleted file mode 100644
index f77473a95..000000000
Binary files a/src/Jackett/Content/logos/sceneaccess.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/scenefz.png b/src/Jackett/Content/logos/scenefz.png
deleted file mode 100644
index 369bb4afb..000000000
Binary files a/src/Jackett/Content/logos/scenefz.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/scenetime.png b/src/Jackett/Content/logos/scenetime.png
deleted file mode 100644
index 99ad3576f..000000000
Binary files a/src/Jackett/Content/logos/scenetime.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/shareisland.png b/src/Jackett/Content/logos/shareisland.png
deleted file mode 100644
index c561f6f3d..000000000
Binary files a/src/Jackett/Content/logos/shareisland.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/shazbat.png b/src/Jackett/Content/logos/shazbat.png
deleted file mode 100644
index 25f83779a..000000000
Binary files a/src/Jackett/Content/logos/shazbat.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/speedcd.png b/src/Jackett/Content/logos/speedcd.png
deleted file mode 100644
index d4f0c04cf..000000000
Binary files a/src/Jackett/Content/logos/speedcd.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/tehconnection.png b/src/Jackett/Content/logos/tehconnection.png
deleted file mode 100644
index aedf8f161..000000000
Binary files a/src/Jackett/Content/logos/tehconnection.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/thehorrorcharnel.png b/src/Jackett/Content/logos/thehorrorcharnel.png
deleted file mode 100644
index b50ff36c7..000000000
Binary files a/src/Jackett/Content/logos/thehorrorcharnel.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/theshinning.png b/src/Jackett/Content/logos/theshinning.png
deleted file mode 100644
index 8ab55a241..000000000
Binary files a/src/Jackett/Content/logos/theshinning.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentbd.png b/src/Jackett/Content/logos/torrentbd.png
deleted file mode 100644
index f03f02a12..000000000
Binary files a/src/Jackett/Content/logos/torrentbd.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentbytes.png b/src/Jackett/Content/logos/torrentbytes.png
deleted file mode 100644
index 517c27425..000000000
Binary files a/src/Jackett/Content/logos/torrentbytes.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentday.png b/src/Jackett/Content/logos/torrentday.png
deleted file mode 100644
index b2189efac..000000000
Binary files a/src/Jackett/Content/logos/torrentday.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentheaven.png b/src/Jackett/Content/logos/torrentheaven.png
deleted file mode 100644
index 1521347e7..000000000
Binary files a/src/Jackett/Content/logos/torrentheaven.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentleech.png b/src/Jackett/Content/logos/torrentleech.png
deleted file mode 100644
index 8ee8f90a0..000000000
Binary files a/src/Jackett/Content/logos/torrentleech.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentnetwork.png b/src/Jackett/Content/logos/torrentnetwork.png
deleted file mode 100644
index 04be3947b..000000000
Binary files a/src/Jackett/Content/logos/torrentnetwork.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentsectorcrew.png b/src/Jackett/Content/logos/torrentsectorcrew.png
deleted file mode 100644
index 49c953146..000000000
Binary files a/src/Jackett/Content/logos/torrentsectorcrew.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentshack.png b/src/Jackett/Content/logos/torrentshack.png
deleted file mode 100644
index 241bba2ed..000000000
Binary files a/src/Jackett/Content/logos/torrentshack.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/torrentsyndikat.png b/src/Jackett/Content/logos/torrentsyndikat.png
deleted file mode 100644
index 93e9d976b..000000000
Binary files a/src/Jackett/Content/logos/torrentsyndikat.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/transmithenet.png b/src/Jackett/Content/logos/transmithenet.png
deleted file mode 100644
index 69f11cb56..000000000
Binary files a/src/Jackett/Content/logos/transmithenet.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/tspate.png b/src/Jackett/Content/logos/tspate.png
deleted file mode 100644
index 67f21f018..000000000
Binary files a/src/Jackett/Content/logos/tspate.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/tvchaosuk.png b/src/Jackett/Content/logos/tvchaosuk.png
deleted file mode 100644
index 015787700..000000000
Binary files a/src/Jackett/Content/logos/tvchaosuk.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/tvvault.png b/src/Jackett/Content/logos/tvvault.png
deleted file mode 100644
index 7fc8d7f4c..000000000
Binary files a/src/Jackett/Content/logos/tvvault.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/uhdbits.png b/src/Jackett/Content/logos/uhdbits.png
deleted file mode 100644
index 9b58671bc..000000000
Binary files a/src/Jackett/Content/logos/uhdbits.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/wihd.png b/src/Jackett/Content/logos/wihd.png
deleted file mode 100644
index c6ccd81f4..000000000
Binary files a/src/Jackett/Content/logos/wihd.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/worldofp2p.png b/src/Jackett/Content/logos/worldofp2p.png
deleted file mode 100644
index 264be4fa6..000000000
Binary files a/src/Jackett/Content/logos/worldofp2p.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/x264.png b/src/Jackett/Content/logos/x264.png
deleted file mode 100644
index c48002c90..000000000
Binary files a/src/Jackett/Content/logos/x264.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/xspeeds.png b/src/Jackett/Content/logos/xspeeds.png
deleted file mode 100644
index 81098b346..000000000
Binary files a/src/Jackett/Content/logos/xspeeds.png and /dev/null differ
diff --git a/src/Jackett/Content/logos/xthor.png b/src/Jackett/Content/logos/xthor.png
deleted file mode 100644
index 104fbe5c2..000000000
Binary files a/src/Jackett/Content/logos/xthor.png and /dev/null differ
diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj
index 664f1607b..df1885da9 100644
--- a/src/Jackett/Jackett.csproj
+++ b/src/Jackett/Jackett.csproj
@@ -375,63 +375,6 @@
Always
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -552,147 +495,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -714,12 +516,6 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
@@ -732,53 +528,14 @@
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
-
- PreserveNewest
-
PreserveNewest
-
- PreserveNewest
-
-
- PreserveNewest
-
TextTemplatingFileGenerator
TorznabCatType.generated.cs
-
- PreserveNewest
-
-
- PreserveNewest
-