replace card view with list view (#803)

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;
 }
 
-
+.indexer-table {
-#unconfigured-indexers{
+   text-align: left;
-   text-align: center;
 }
 
-#unconfigured-indexers .card {
+.test-success {
-    width: 200px;
+    color: #449d44;
-    position: relative;
 }
 
-.unconfigured-indexer {
+.test-error {
-    height: 70px;
+    color: #c9302c;
 }
 
-
+.test-inprogress {
-
+    color: #286090;
-.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;
 }
 
 .indexer-buttons {
@@ -94,33 +50,7 @@
 }
 
 .indexer-button-test {
-    width: 60px;
+   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;
 }
 
 .setup-item-inputstring {
@@ -297,3 +227,8 @@ pre {
     display: none;
 }
 
+.table td.fit{
+    white-space: nowrap;
+    width: 1%;
+}
+

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) {
+function displayConfiguredIndexersList(indexers) {
-    var indexerTemplate = Handlebars.compile($("#configured-indexer").html());
+    var indexersTemplate = Handlebars.compile($("#configured-indexer-table").html());
-    var unconfiguredIndexerTemplate = Handlebars.compile($("#unconfigured-indexer").html());
+    var indexersTable = $(indexersTemplate({ indexers: indexers }));
-    $('#unconfigured-indexers-template').empty();
+    indexersTable.find('table').DataTable(
-    for (var i = 0; i < items.length; i++) {
+         {
-        var item = items[i];
+             "pageLength": 100,
-        item.torznab_host = resolveUrl(basePath + "/torznab/" + item.id);
+             "lengthMenu": [[10, 20, 50, 100, 200, -1], [10, 20, 50, 100, 200, "All"]],
-        item.potato_host = resolveUrl(basePath + "/potato/" + item.id);
+             "order": [[0, "desc"]],
-        if (item.configured)
+             "columnDefs": [
-            $('#indexers').append(indexerTemplate(item));
+                {
-        else
+                    "targets": 0,
-            $('#unconfigured-indexers-template').append($(unconfiguredIndexerTemplate(item)));
+                    "visible": true,
-    }
+                    "searchable": true
-
+                },
-    var addIndexerButton = $($('#add-indexer').html());
+                {
-    addIndexerButton.appendTo($('#indexers'));
+                    "targets": 1,
-
+                    "visible": true,
-    addIndexerButton.click(function () {
+                    "searchable": false
-        $("#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);
-                });
-            });
-        });
-    });
     
+    $('#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");
+            testIndexer(id, true);
-            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");
-            });
         });
     });
 }
@@ -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());

src/Jackett/Content/index.html

@@ -32,11 +32,17 @@
         </div>
         <hr />
         <div class="pull-right">
+            <button id="jackett-add-indexer" class="btn btn-success btn-sm">
+                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> Add indexer
+            </button>
             <button id="jackett-show-search" class="btn btn-success btn-sm">
-                <i class="fa fa-search"></i> Manual Search <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                <span class="glyphicon glyphicon-search" aria-hidden="true"></span> Manual Search 
             </button>
             <button id="jackett-show-releases" class="btn btn-primary btn-sm">
-                <i class="fa fa-database"></i>  View cached releases <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                <i class="fa fa-database"></i>  View cached releases
+            </button>
+            <button id="jackett-test-all" class="btn btn-warning btn-sm">
+                <span class="glyphicon glyphicon-screenshot" aria-hidden="true"></span> Test All 
             </button>
         </div>
         <h3>Configured Indexers</h3>
@@ -170,49 +176,83 @@
         </div>
     </script>
 
-    <script id="configured-indexer" type="text/x-handlebars-template">
-        <div class="configured-indexer indexer card">
-            <div class="indexer-logo">
-                <!-- Make section browser searchable -->
-                <span class="hidden-name">{{name}}</span>
-                <img alt="{{name}}" title="{{name}}" src="../logos/{{id}}.png" />
-            </div>
-            <div class="indexer-buttons">
-                <button class="btn btn-primary btn-sm indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
-                    <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
-                </button>
-                <button class="btn btn-danger btn-sm indexer-button-delete" data-id="{{id}}">
-                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
-                </button>
-                <a class="btn btn-info btn-sm" target="_blank" href="{{site_link}}">
-                    <span class="glyphicon glyphicon-new-window" aria-hidden="true"></span>
-                </a>
-                <button class="btn btn-warning btn-sm indexer-button-test" data-id="{{id}}">
-                    Test <span class="glyphicon glyphicon-screenshot" aria-hidden="true"></span>
-                </button>
-            </div>
-            <div class="indexer-host">
-                <b>Torznab Host:</b>
-                <input class="form-control" type="text" value="{{torznab_host}}" placeholder="Torznab Host" readonly="">
-                <b>CouchPotato Host:</b>
-                {{#if potatoenabled}}
 
-                <input class="form-control" type="text" value="{{potato_host}}" placeholder="Torznab Host" readonly="">
+    <script id="configured-indexer-table" type="text/x-handlebars-template">
-                {{else}}
+        <table class="indexer-table configured-indexer-table dataTable compact cell-border hover stripe table table-responsive">
-                <input class="form-control" type="text" value="Not available" placeholder="Torznab Host" readonly="">
+            <thead>
-                {{/if}}
+                <tr>
-            </div>
+                    <th>Indexer</th>
-        </div>
+                    <th>Actions</th>
+                </tr>
+            </thead>
+            <tbody>
+                {{#each indexers}}
+                <tr class="configured-indexer-row">
+                    <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
+                    <td class="fit">
+                        <div class="indexer-buttons">
+                            <button title="{{torznab_host}}" type="button" class="indexer-button-copy btn btn-xs btn-info">Copy Torznab Feed</button>
+                            <button title="{{potato_host}}" type="button" class="indexer-button-copy btn btn-xs btn-info{{#unless potatoenabled}} disabled{{/unless}}">Copy Potato Feed</button>
+
+                            <button title="Configure" class="btn btn-primary btn-xs indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
+                                <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span>
+                            </button>
+                            <button title="Delete" class="btn btn-danger btn-xs indexer-button-delete" data-id="{{id}}">
+                                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span>
+                            </button>
+                            <button title="{{last_error}}" class="btn btn-warning btn-xs indexer-button-test" data-toggle="tooltip" data-id="{{id}}" data-state="{{state}}">
+                                Test
+                                <span class="glyphicon" aria-hidden="true"></span>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
+                {{/each}}
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </tfoot>
+        </table>      
     </script>
-    <script id="unconfigured-indexer" type="text/x-handlebars-template">
-        <div class="unconfigured-indexer card">
-            <div class="indexer-logo indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
-                <!-- Make section browser searchable -->
-                <span class="hidden-name">{{name}}</span>
-                <img alt="{{name}}" title="{{name}}" src="../logos/{{id}}.png" />
 
-            </div>
+    <script id="unconfigured-indexer-table" type="text/x-handlebars-template">
-        </div>
+        <table class="indexer-table configured-indexer-table dataTable compact cell-border hover stripe table table-responsive">
+            <thead>
+                <tr>
+                    <th>Indexer</th>
+                    <th>Categories</th>
+                    <th>Language</th>
+                    <th></th>
+                </tr>
+            </thead>
+            <tbody>
+                {{#each indexers}}
+                <tr class="unconfigured-indexer-row">
+                    <td><a target="_blank" href="{{site_link}}" title="{{description}}">{{name}}</a></td>
+                    <td>{{mains_cats}}</td>
+                    <td>{{language}}</td>
+                    <td class="fit">
+                        <div class="indexer-buttons">
+                            <button title="Configure" class="btn btn-success btn-xs indexer-setup" data-id="{{id}}" data-link="{{site_link}}">
+                                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
+                            </button>
+                        </div>
+                    </td>
+                </tr>
+                {{/each}}
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </tfoot>
+        </table>
     </script>
 
     <script id="jackett-releases" type="text/x-handlebars-template">
@@ -497,14 +537,7 @@
             </div>
         </div>
     </script>
-    <script id="add-indexer" type="text/x-handlebars-template">
+
-        <button class="indexer card add-indexer" data-toggle="modal">
-            <div class="indexer-add-content">
-                <span class="glyphicon glyphicon glyphicon-plus" aria-hidden="true"></span>
-                <div class="light-text">Add</div>
-            </div>
-        </button>
-    </script>
     <script id="spinner" type="text/x-handlebars-template">
         <span class="spinner glyphicon glyphicon-refresh"></span>
     </script>

src/Jackett/Jackett.csproj

@@ -375,63 +375,6 @@
     <None Include="CurlSharp.dll.config">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <Content Include="Content\logos\alphareign.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\animetorrents.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\apollo.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bjshare.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\blubits.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\eotforum.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\ethor.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\freakstrackingsystem.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\hd4free.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\newretro.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\shareisland.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\thehorrorcharnel.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\theshinning.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentbd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentsectorcrew.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\tspate.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\tvvault.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\uhdbits.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\worldofp2p.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Definitions\hdme.yml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -552,147 +495,6 @@
     <Content Include="Content\login.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\logos\andraste.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bestfriends.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\funfile.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\ghostcity.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\hdme.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\houseoftorrents.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\myamity.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\myanonamouse.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\newrealworld.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\passthepopcorn.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\piratethenet.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentheaven.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentnetwork.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentsyndikat.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\x264.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\xthor.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\animebytes.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\avistaz.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bb.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\beyondhd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bitsoup.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\broadcastthenet.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\danishbits.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\demonoid.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\digitalhive.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\cinemaz.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\filelist.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\fuzer.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\gftracker.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\hdspace.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\hdtorrents.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\ilovetorrents.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\immortalseed.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\hounddawgs.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\ncore.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\pretome.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\privatehd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\revolutiontt.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\sceneaccess.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\scenefz.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\scenetime.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\shazbat.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\speedcd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\tehconnection.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentbytes.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentday.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentshack.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\animate.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -714,12 +516,6 @@
     <Content Include="Content\jacket_medium.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\logos\bithdtv.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bitmetv.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\bootstrap\bootstrap.min.css">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -732,53 +528,14 @@
     <Content Include="Content\index.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\logos\freshon.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\iptorrents.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\morethantv.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\torrentleech.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\transmithenet.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\tvchaosuk.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\abnormal.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\wihd.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\xspeeds.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Content\setup_indexer.html">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="Content\logos\hebits.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bitcityreloaded.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
     <Content Include="Models\TorznabCatType.tt">
       <Generator>TextTemplatingFileGenerator</Generator>
       <LastGenOutput>TorznabCatType.generated.cs</LastGenOutput>
     </Content>
     <Content Include="Resources\validator_reply.xml" />
-    <Content Include="Content\logos\alpharatio.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Content\logos\bakabt.png">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\CurlSharp\CurlSharp.csproj">