Commit 79735d78 authored by echel0n's avatar echel0n

Fixed issue with custom provider not being saved when using spaces for names.

Fixed parsing issue with Jackett.
Fixed issue with missing provider icons.
parent 6d8c60a0
# Changelog
- * ba79a49 - 2018-10-14: Fixed issue with custom providers having spaces in their names that was causing settings to not save
- * d0c5c9e - 2018-10-14: Fixed issue with custom provider not being saved when using spaces for names. Fixed parsing issue with Jackett. Fixed issue with missing provider icons.
- * 6d8c60a - 2018-10-14: Fixed issue with custom providers having spaces in their names that was causing settings to not save
- * 23f9684 - 2018-10-14: Fixed issues with removing custom torrent/newznab providers
- * e2132a2 - 2018-10-14: Fixed issue#286 - added support for non-english indexer images
- * d186f55 - 2018-10-14: Release v9.3.87
......
......@@ -1945,6 +1945,11 @@
"integrity": "sha1-OuyFAA+mGQhdqNLkmD39Z88hFMs=",
"dev": true
},
"bootstrap-formhelpers": {
"version": "github:winmarkltd/BootstrapFormHelpers#d6770e09f6ce674631bed10b3f3672f11edc4278",
"from": "github:winmarkltd/BootstrapFormHelpers",
"dev": true
},
"brace-expansion": {
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
......@@ -5400,7 +5405,7 @@
"grunt-spritesmith": {
"version": "6.6.2",
"resolved": "https://registry.npmjs.org/grunt-spritesmith/-/grunt-spritesmith-6.6.2.tgz",
"integrity": "sha1-lP1QKACADrXDxJ/qJV1lz04S9ic=",
"integrity": "sha512-Wo/fxqY2e83OsjOWJxFsvZEnhMnfMBBYWeFDd5ySUDGt0q+xNyWkgwDPyZyiOe+0eWhW9Ny9mEXi8MgG67irdg==",
"dev": true,
"requires": {
"async": "~1.5.0",
......@@ -14622,7 +14627,7 @@
},
"webpack-spritesmith": {
"version": "0.4.1",
"resolved": "https://registry.npmjs.org/webpack-spritesmith/-/webpack-spritesmith-0.4.1.tgz",
"resolved": "http://registry.npmjs.org/webpack-spritesmith/-/webpack-spritesmith-0.4.1.tgz",
"integrity": "sha512-EmXxGuLbM5VDksfw1R9W4a9hK6dq8jkeC9z2wV8CZv/4bcdP4YIY5Tw1gP4IZcrWV0ABUfFl6RVDsNw+z+0Jhg==",
"dev": true,
"requires": {
......@@ -14646,9 +14651,9 @@
}
},
"glob": {
"version": "7.1.2",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
"integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
"version": "7.1.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.1.3.tgz",
"integrity": "sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==",
"dev": true,
"requires": {
"fs.realpath": "^1.0.0",
......
{
"name": "SiCKRAGE",
"name": "sickrage",
"private": true,
"repository": {
"type": "git",
"url": "git+https://git.sickrage.ca/SiCKRAGE/sickrage.git"
},
"bugs": {
"url": "https://www.sickrage.ca/forums/"
"url": "https://forums.sickrage.ca"
},
"homepage": "https://www.sickrage.ca",
"scripts": {
......@@ -24,7 +24,7 @@
"babel-plugin-add-module-exports": "^0.2.1",
"babel-preset-env": "^1.7.0",
"bootstrap": "^4.1.1",
"bootstrap-formhelpers": "winmarkltd/BootstrapFormHelpers",
"bootstrap-formhelpers": "echel0n/BootstrapFormHelpers",
"clean-webpack-plugin": "^0.1.19",
"css-loader": "^1.0.0",
"eslint": "^5.1.0",
......@@ -37,7 +37,7 @@
"grunt-exec": "^2.0.0",
"grunt-google-fonts": "^0.3.0",
"grunt-npm-install": "^0.3.1",
"grunt-spritesmith": "^6.4.0",
"grunt-spritesmith": "^6.6.2",
"grunt-webpack": "^3.1.2",
"imagesloaded": "^4.1.4",
"isotope-layout": "^3.0.6",
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1211,7 +1211,10 @@ class NewznabProvider(NZBProvider):
item_size = size_regex.group() if size_regex else -1
else:
item_size = item.size.get_text(strip=True) if item.size else -1
for attr in item('newznab:attr') + item('torznab:attr'):
newznab_attrs = item(re.compile('newznab:attr'))
torznab_attrs = item(re.compile('torznab:attr'))
for attr in newznab_attrs + torznab_attrs:
item_size = attr['value'] if attr['name'] == 'size' else item_size
seeders = try_int(attr['value']) if attr['name'] == 'seeders' else seeders
peers = try_int(attr['value']) if attr['name'] == 'peers' else None
......
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
This diff was suppressed by a .gitattributes entry.
......@@ -4801,7 +4801,7 @@ $(document).ready(function ($) {
}
if ($('#provider_order_list > #' + id).length === 0 && showProvider !== 'false') {
//$('#provider_order_list').append('<li class="ui-state-default" id="' + id + '"> <input type="checkbox" id="enable_' + id + '" class="provider_enabler" CHECKED> <a href="' + SICKRAGE.anonURL + url + '" class="imgLink" target="_new"><img src="' + SICKRAGE.srWebRoot + '/images/providers/nzb.png" alt="' + name + '" width="16" height="16"></a> ' + name + '</li>');
$('#provider_order_list').append('<div class="list-group-item list-group-item-action list-group-item-dark rounded mb-1 p-2" id="' + id + '"><div class="align-middle"><label class="form-check-label" for="enable_' + id + '"><input type="checkbox" id="enable_' + id + '" class="provider_enabler text-left" checked><a href="' + SICKRAGE.anonURL + url + '" class="text-right" target="_new"> <i class="sickrage-providers sickrage-providers-newznab"></i></a> <span class="font-weight-bold">' + name + '</span></label><span class="float-right d-inline-block"><i class="fas fa-lock text-danger"></i></span></div>');
$('#provider_order_list').sortable("refresh");
}
......@@ -4818,6 +4818,7 @@ $(document).ready(function ($) {
deleteNewznabProvider: function (id) {
$("#editANewznabProvider option[value='" + id + "']").remove();
$(".list-group #" + id).remove();
SICKRAGE.config.providers.populateNewznabSection();
delete SICKRAGE.config.providers.newznabProviders[id];
SICKRAGE.config.providers.refreshProviderList();
......@@ -4941,7 +4942,7 @@ $(document).ready(function ($) {
}
if ($('#provider_order_list > #' + id).length === 0 && showProvider !== 'false') {
//$('#provider_order_list').append('<li class="ui-state-default" id="' + id + '"> <input type="checkbox" id="enable_' + id + '" class="provider_enabler" CHECKED> <a href="' + SICKRAGE.anonURL + url + '" class="imgLink" target="_new"><img src="' + SICKRAGE.srWebRoot + '/images/providers/torrent.png" alt="' + name + '" width="16" height="16"></a> ' + name + '</li>');
$('#provider_order_list').append('<div class="list-group-item list-group-item-action list-group-item-secondary rounded mb-1 p-2" id="' + id + '"><div class="align-middle"><label class="form-check-label" for="enable_' + id + '"><input type="checkbox" id="enable_' + id + '" class="provider_enabler text-left" checked><a href="' + SICKRAGE.anonURL + url + '" class="text-right" target="_new"> <i class="sickrage-providers sickrage-providers-torrentrss"></i></a> <span class="font-weight-bold">' + name + '</span></label><span class="float-right d-inline-block"><i class="fas fa-lock text-danger"></i></span></div>');
$('#provider_order_list').sortable("refresh");
}
......@@ -4958,6 +4959,7 @@ $(document).ready(function ($) {
deleteTorrentRssProvider: function (id) {
$("#editATorrentRssProvider option[value='" + id + "']").remove();
$(".list-group #" + id).remove();
SICKRAGE.config.providers.populateTorrentRssSection();
delete SICKRAGE.config.providers.torrentRssProviders[id];
SICKRAGE.config.providers.refreshProviderList();
......
......@@ -9,7 +9,7 @@ const templateFunction = function (data) {
var iconName = path.basename(data.sprites[0].image, path.extname(data.sprites[0].image))
.replace('~', '');
var shared = '.D { display: inline-block; background-image: url(I) }'
var shared = '.D { display: inline-block; background-image: url(I); }'
.replace('D', iconName)
.replace('I', data.sprites[0].image);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment