diff --git a/themes-default/slim/static/js/add-show-options.js b/themes-default/slim/static/js/add-show-options.js index 5df36547f0..4ea832c159 100644 --- a/themes-default/slim/static/js/add-show-options.js +++ b/themes-default/slim/static/js/add-show-options.js @@ -9,17 +9,19 @@ $(document).ready(() => { bestQualArray.push($(d).val()); }); - // @TODO: Move this to API - $.get('config/general/saveAddShowDefaults', { + const data = { defaultStatus: $('#statusSelect').val(), allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase - defaultFlattenFolders: $('#flatten_folders').prop('checked'), + defaultFlattenFolders: !$('#season_folders').prop('checked'), // Flatten folders is the contrary of season folders! subtitles: $('#subtitles').prop('checked'), anime: $('#anime').prop('checked'), scene: $('#scene').prop('checked'), defaultStatusAfter: $('#statusSelectAfter').val() - }); + }; + + // @TODO: Move this to API + $.get('config/general/saveAddShowDefaults', data); $(event.currentTarget).prop('disabled', true); new PNotify({ // eslint-disable-line no-new @@ -29,7 +31,7 @@ $(document).ready(() => { }); }); - $(document.body).on('change', '#statusSelect, #qualityPreset, #flatten_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter', () => { + $(document.body).on('change', '#statusSelect, #qualityPreset, #season_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter', () => { $('#saveDefaultsButton').prop('disabled', false); }); diff --git a/themes-default/slim/static/js/add-shows/init.js b/themes-default/slim/static/js/add-shows/init.js index ed8134d662..13f2b5db3a 100644 --- a/themes-default/slim/static/js/add-shows/init.js +++ b/themes-default/slim/static/js/add-shows/init.js @@ -147,46 +147,8 @@ MEDUSA.addShows.init = function() { }); return false; }); - - $('#saveDefaultsButton').on('click', function() { - const anyQualArray = []; - const bestQualArray = []; - $('#allowed_qualities option:selected').each((i, d) => { - anyQualArray.push($(d).val()); - }); - $('#preferred_qualities option:selected').each((i, d) => { - bestQualArray.push($(d).val()); - }); - - $.get('config/general/saveAddShowDefaults', { - defaultStatus: $('#statusSelect').val(), - allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase - preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase - defaultFlattenFolders: $('#flatten_folders').prop('checked'), - subtitles: $('#subtitles').prop('checked'), - anime: $('#anime').prop('checked'), - scene: $('#scene').prop('checked'), - defaultStatusAfter: $('#statusSelectAfter').val() - }); - - $(this).prop('disabled', true); - new PNotify({ // eslint-disable-line no-new - title: 'Saved Defaults', - text: 'Your "add show" defaults have been set to your current selections.', - shadow: false - }); - }); - - $('#statusSelect, #qualityPreset, #flatten_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter').on('change', () => { - $('#saveDefaultsButton').prop('disabled', false); - }); - - $('#qualityPreset').on('change', () => { - // Fix issue #181 - force re-render to correct the height of the outer div - $('span.prev').click(); - $('span.next').click(); - }); }; + $.updateBlackWhiteList = function(showName) { $('#white').children().remove(); $('#black').children().remove(); diff --git a/themes-default/slim/views/editShow.mako b/themes-default/slim/views/editShow.mako index 8647cf61b9..7f0a2bc977 100644 --- a/themes-default/slim/views/editShow.mako +++ b/themes-default/slim/views/editShow.mako @@ -154,7 +154,7 @@ const startVue = () => { diff --git a/themes-default/slim/views/inc_addShowOptions.mako b/themes-default/slim/views/inc_addShowOptions.mako index c7730fb067..9159a85071 100644 --- a/themes-default/slim/views/inc_addShowOptions.mako +++ b/themes-default/slim/views/inc_addShowOptions.mako @@ -52,7 +52,7 @@ diff --git a/themes/dark/assets/js/add-show-options.js b/themes/dark/assets/js/add-show-options.js index 5df36547f0..4ea832c159 100644 --- a/themes/dark/assets/js/add-show-options.js +++ b/themes/dark/assets/js/add-show-options.js @@ -9,17 +9,19 @@ $(document).ready(() => { bestQualArray.push($(d).val()); }); - // @TODO: Move this to API - $.get('config/general/saveAddShowDefaults', { + const data = { defaultStatus: $('#statusSelect').val(), allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase - defaultFlattenFolders: $('#flatten_folders').prop('checked'), + defaultFlattenFolders: !$('#season_folders').prop('checked'), // Flatten folders is the contrary of season folders! subtitles: $('#subtitles').prop('checked'), anime: $('#anime').prop('checked'), scene: $('#scene').prop('checked'), defaultStatusAfter: $('#statusSelectAfter').val() - }); + }; + + // @TODO: Move this to API + $.get('config/general/saveAddShowDefaults', data); $(event.currentTarget).prop('disabled', true); new PNotify({ // eslint-disable-line no-new @@ -29,7 +31,7 @@ $(document).ready(() => { }); }); - $(document.body).on('change', '#statusSelect, #qualityPreset, #flatten_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter', () => { + $(document.body).on('change', '#statusSelect, #qualityPreset, #season_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter', () => { $('#saveDefaultsButton').prop('disabled', false); }); diff --git a/themes/dark/assets/js/add-show-options.js.map b/themes/dark/assets/js/add-show-options.js.map index 1ff3fed04f..fef4913002 100644 --- a/themes/dark/assets/js/add-show-options.js.map +++ b/themes/dark/assets/js/add-show-options.js.map @@ -1 +1 @@ -{"version":3,"names":[],"mappings":"","sources":["js/add-show-options.js"],"sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o {\n $(document.body).on('click', '#saveDefaultsButton', event => {\n const anyQualArray = [];\n const bestQualArray = [];\n $('#allowed_qualities option:selected').each((i, d) => {\n anyQualArray.push($(d).val());\n });\n $('#preferred_qualities option:selected').each((i, d) => {\n bestQualArray.push($(d).val());\n });\n\n // @TODO: Move this to API\n $.get('config/general/saveAddShowDefaults', {\n defaultStatus: $('#statusSelect').val(),\n allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase\n preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase\n defaultFlattenFolders: $('#flatten_folders').prop('checked'),\n subtitles: $('#subtitles').prop('checked'),\n anime: $('#anime').prop('checked'),\n scene: $('#scene').prop('checked'),\n defaultStatusAfter: $('#statusSelectAfter').val()\n });\n\n $(event.currentTarget).prop('disabled', true);\n new PNotify({ // eslint-disable-line no-new\n title: 'Saved Defaults',\n text: 'Your \"add show\" defaults have been set to your current selections.',\n shadow: false\n });\n });\n\n $(document.body).on('change', '#statusSelect, #qualityPreset, #flatten_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter', () => {\n $('#saveDefaultsButton').prop('disabled', false);\n });\n\n $(document.body).on('change', '#qualityPreset', () => {\n // Fix issue #181 - force re-render to correct the height of the outer div\n $('span.prev').click();\n $('span.next').click();\n });\n});\n\n},{}]},{},[1]);\n"],"file":"add-show-options.js"} \ No newline at end of file +{"version":3,"names":[],"mappings":"","sources":["js/add-show-options.js"],"sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o {\n $(document.body).on('click', '#saveDefaultsButton', event => {\n const anyQualArray = [];\n const bestQualArray = [];\n $('#allowed_qualities option:selected').each((i, d) => {\n anyQualArray.push($(d).val());\n });\n $('#preferred_qualities option:selected').each((i, d) => {\n bestQualArray.push($(d).val());\n });\n\n const data = {\n defaultStatus: $('#statusSelect').val(),\n allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase\n preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase\n defaultFlattenFolders: !$('#season_folders').prop('checked'), // Flatten folders is the contrary of season folders!\n subtitles: $('#subtitles').prop('checked'),\n anime: $('#anime').prop('checked'),\n scene: $('#scene').prop('checked'),\n defaultStatusAfter: $('#statusSelectAfter').val()\n };\n\n // @TODO: Move this to API\n $.get('config/general/saveAddShowDefaults', data);\n\n $(event.currentTarget).prop('disabled', true);\n new PNotify({ // eslint-disable-line no-new\n title: 'Saved Defaults',\n text: 'Your \"add show\" defaults have been set to your current selections.',\n shadow: false\n });\n });\n\n $(document.body).on('change', '#statusSelect, #qualityPreset, #season_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter', () => {\n $('#saveDefaultsButton').prop('disabled', false);\n });\n\n $(document.body).on('change', '#qualityPreset', () => {\n // Fix issue #181 - force re-render to correct the height of the outer div\n $('span.prev').click();\n $('span.next').click();\n });\n});\n\n},{}]},{},[1]);\n"],"file":"add-show-options.js"} \ No newline at end of file diff --git a/themes/dark/assets/js/add-shows/init.js b/themes/dark/assets/js/add-shows/init.js index ed8134d662..13f2b5db3a 100644 --- a/themes/dark/assets/js/add-shows/init.js +++ b/themes/dark/assets/js/add-shows/init.js @@ -147,46 +147,8 @@ MEDUSA.addShows.init = function() { }); return false; }); - - $('#saveDefaultsButton').on('click', function() { - const anyQualArray = []; - const bestQualArray = []; - $('#allowed_qualities option:selected').each((i, d) => { - anyQualArray.push($(d).val()); - }); - $('#preferred_qualities option:selected').each((i, d) => { - bestQualArray.push($(d).val()); - }); - - $.get('config/general/saveAddShowDefaults', { - defaultStatus: $('#statusSelect').val(), - allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase - preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase - defaultFlattenFolders: $('#flatten_folders').prop('checked'), - subtitles: $('#subtitles').prop('checked'), - anime: $('#anime').prop('checked'), - scene: $('#scene').prop('checked'), - defaultStatusAfter: $('#statusSelectAfter').val() - }); - - $(this).prop('disabled', true); - new PNotify({ // eslint-disable-line no-new - title: 'Saved Defaults', - text: 'Your "add show" defaults have been set to your current selections.', - shadow: false - }); - }); - - $('#statusSelect, #qualityPreset, #flatten_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter').on('change', () => { - $('#saveDefaultsButton').prop('disabled', false); - }); - - $('#qualityPreset').on('change', () => { - // Fix issue #181 - force re-render to correct the height of the outer div - $('span.prev').click(); - $('span.next').click(); - }); }; + $.updateBlackWhiteList = function(showName) { $('#white').children().remove(); $('#black').children().remove(); diff --git a/themes/dark/assets/js/add-shows/init.js.map b/themes/dark/assets/js/add-shows/init.js.map index 46845db049..83b83da263 100644 --- a/themes/dark/assets/js/add-shows/init.js.map +++ b/themes/dark/assets/js/add-shows/init.js.map @@ -1 +1 @@ -{"version":3,"names":[],"mappings":"","sources":["js/add-shows/init.js"],"sourcesContent":["(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require==\"function\"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error(\"Cannot find module '\"+o+\"'\");throw f.code=\"MODULE_NOT_FOUND\",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require==\"function\"&&require;for(var o=0;o see options section\n threshold: 500\n });\n\n $.initRemoteShowGrid = function () {\n // Set defaults on page load\n imgLazyLoad.update();\n imgLazyLoad.handleScroll();\n $('#showsort').val('original');\n $('#showsortdirection').val('asc');\n\n $('#showsort').on('change', function () {\n let sortCriteria;\n switch (this.value) {\n case 'original':\n sortCriteria = 'original-order';\n break;\n case 'rating':\n /* Randomise, else the rating_votes can already\n * have sorted leaving this with nothing to do.\n */\n $('#container').isotope({ sortBy: 'random' });\n sortCriteria = 'rating';\n break;\n case 'rating_votes':\n sortCriteria = ['rating', 'votes'];\n break;\n case 'votes':\n sortCriteria = 'votes';\n break;\n default:\n sortCriteria = 'name';\n break;\n }\n $('#container').isotope({\n sortBy: sortCriteria\n });\n });\n\n $('#rootDirs').on('change', () => {\n $.rootDirCheck();\n });\n\n $('#showsortdirection').on('change', function () {\n $('#container').isotope({\n sortAscending: this.value === 'asc'\n });\n });\n\n $('#container').isotope({\n sortBy: 'original-order',\n layoutMode: 'fitRows',\n getSortData: {\n name(itemElem) {\n const name = $(itemElem).attr('data-name') || '';\n return (MEDUSA.config.sortArticle ? name : name.replace(/^((?:The|A|An)\\s)/i, '')).toLowerCase();\n },\n rating: '[data-rating] parseInt',\n votes: '[data-votes] parseInt'\n }\n }).on('layoutComplete arrangeComplete removeComplete', () => {\n imgLazyLoad.update();\n imgLazyLoad.handleScroll();\n });\n };\n\n $.fn.loadRemoteShows = function (path, loadingTxt, errorTxt) {\n $(this).html(' ' + loadingTxt);\n $(this).load(path + ' #container', function (response, status) {\n if (status === 'error') {\n $(this).empty().html(errorTxt);\n } else {\n $.initRemoteShowGrid();\n imgLazyLoad.update();\n imgLazyLoad.handleScroll();\n }\n });\n };\n\n /*\n * Blacklist a show by series id.\n */\n $.initBlackListShowById = function () {\n $(document.body).on('click', 'button[data-blacklist-show]', function (e) {\n e.preventDefault();\n\n if ($(this).is(':disabled')) {\n return false;\n }\n\n $(this).html('Blacklisted').prop('disabled', true);\n $(this).parent().find('button[data-add-show]').prop('disabled', true);\n\n $.get('addShows/addShowToBlacklist?seriesid=' + $(this).attr('data-indexer-id'));\n return false;\n });\n };\n\n /*\n * Adds show by indexer and indexer_id with a number of optional parameters\n * The show can be added as an anime show by providing the data attribute: data-isanime=\"1\"\n */\n $.initAddShowById = function () {\n $(document.body).on('click', 'button[data-add-show]', function (e) {\n e.preventDefault();\n\n if ($(this).is(':disabled')) {\n return false;\n }\n\n $(this).html('Added').prop('disabled', true);\n $(this).parent().find('button[data-blacklist-show]').prop('disabled', true);\n\n const anyQualArray = [];\n const bestQualArray = [];\n $('#allowed_qualities option:selected').each((i, d) => {\n anyQualArray.push($(d).val());\n });\n $('#preferred_qualities option:selected').each((i, d) => {\n bestQualArray.push($(d).val());\n });\n\n // If we are going to add an anime, let's by default configure it as one\n const anime = $('#anime').prop('checked');\n const configureShowOptions = $('#configure_show_options').prop('checked');\n\n $.get('addShows/addShowByID?indexername=' + $(this).attr('data-indexer') + '&seriesid=' + $(this).attr('data-indexer-id'), {\n root_dir: $('#rootDirs option:selected').val(), // eslint-disable-line camelcase\n configure_show_options: configureShowOptions, // eslint-disable-line camelcase\n show_name: $(this).attr('data-show-name'), // eslint-disable-line camelcase\n quality_preset: $('#qualityPreset').val(), // eslint-disable-line camelcase\n default_status: $('#statusSelect').val(), // eslint-disable-line camelcase\n any_qualities: anyQualArray.join(','), // eslint-disable-line camelcase\n best_qualities: bestQualArray.join(','), // eslint-disable-line camelcase\n default_flatten_folders: $('#flatten_folders').prop('checked'), // eslint-disable-line camelcase\n subtitles: $('#subtitles').prop('checked'),\n anime,\n scene: $('#scene').prop('checked'),\n default_status_after: $('#statusSelectAfter').val() // eslint-disable-line camelcase\n });\n return false;\n });\n\n $('#saveDefaultsButton').on('click', function () {\n const anyQualArray = [];\n const bestQualArray = [];\n $('#allowed_qualities option:selected').each((i, d) => {\n anyQualArray.push($(d).val());\n });\n $('#preferred_qualities option:selected').each((i, d) => {\n bestQualArray.push($(d).val());\n });\n\n $.get('config/general/saveAddShowDefaults', {\n defaultStatus: $('#statusSelect').val(),\n allowed_qualities: anyQualArray.join(','), // eslint-disable-line camelcase\n preferred_qualities: bestQualArray.join(','), // eslint-disable-line camelcase\n defaultFlattenFolders: $('#flatten_folders').prop('checked'),\n subtitles: $('#subtitles').prop('checked'),\n anime: $('#anime').prop('checked'),\n scene: $('#scene').prop('checked'),\n defaultStatusAfter: $('#statusSelectAfter').val()\n });\n\n $(this).prop('disabled', true);\n new PNotify({ // eslint-disable-line no-new\n title: 'Saved Defaults',\n text: 'Your \"add show\" defaults have been set to your current selections.',\n shadow: false\n });\n });\n\n $('#statusSelect, #qualityPreset, #flatten_folders, #allowed_qualities, #preferred_qualities, #subtitles, #scene, #anime, #statusSelectAfter').on('change', () => {\n $('#saveDefaultsButton').prop('disabled', false);\n });\n\n $('#qualityPreset').on('change', () => {\n // Fix issue #181 - force re-render to correct the height of the outer div\n $('span.prev').click();\n $('span.next').click();\n });\n };\n $.updateBlackWhiteList = function (showName) {\n $('#white').children().remove();\n $('#black').children().remove();\n $('#pool').children().remove();\n\n if ($('#anime').prop('checked') && showName) {\n $('#blackwhitelist').show();\n if (showName) {\n $.getJSON('home/fetch_releasegroups', {\n show_name: showName // eslint-disable-line camelcase\n }, data => {\n if (data.result === 'success') {\n $.each(data.groups, (i, group) => {\n const option = $('