github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-16 10:03:51 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix GitIgnore, Update from Sonarr

Browse source
This commit is contained in:
Qstick 2017-09-10 21:20:36 -04:00
parent 77f1d2e64c
commit 22d9c5e666
17 changed files with 603 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

23
frontend/src/Store/Actions/Creators/createSaveProviderHandler.js
View file

@ -1,8 +1,19 @@
import $ from 'jquery';
import { batchActions } from 'redux-batched-actions';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import getProviderState from 'Utilities/State/getProviderState';
import { set, updateItem } from '../baseActions';
const abortCurrentRequests = {};
export function createCancelSaveProviderHandler(section) {
return function(payload) {
if (abortCurrentRequests[section]) {
abortCurrentRequests[section]();
abortCurrentRequests[section] = null;
}
};
}
function createSaveProviderHandler(section, url, getFromState) {
return function(payload) {
return function(dispatch, getState) {
@ -24,9 +35,11 @@ function createSaveProviderHandler(section, url, getFromState) {
ajaxOptions.method = 'PUT';
}
const promise = $.ajax(ajaxOptions);
const { request, abortRequest } = createAjaxRequest()(ajaxOptions);
promise.done((data) => {
abortCurrentRequests[section] = abortRequest;
request.done((data) => {
dispatch(batchActions([
updateItem({ section, ...data }),
@ -39,11 +52,11 @@ function createSaveProviderHandler(section, url, getFromState) {
]));
});
promise.fail((xhr) => {
request.fail((xhr) => {
dispatch(set({
section,
isSaving: false,
saveError: xhr
saveError: xhr.aborted ? null : xhr
}));
});
};

23
frontend/src/Store/Actions/Creators/createTestProviderHandler.js
View file

@ -1,7 +1,18 @@
import $ from 'jquery';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import getProviderState from 'Utilities/State/getProviderState';
import { set } from '../baseActions';
const abortCurrentRequests = {};
export function createCancelTestProviderHandler(section) {
return function(payload) {
if (abortCurrentRequests[section]) {
abortCurrentRequests[section]();
abortCurrentRequests[section] = null;
}
};
}
function createTestProviderHandler(section, url, getFromState) {
return function(payload) {
return function(dispatch, getState) {
@ -17,9 +28,11 @@ function createTestProviderHandler(section, url, getFromState) {
data: JSON.stringify(testData)
};
const promise = $.ajax(ajaxOptions);
const { request, abortRequest } = createAjaxRequest()(ajaxOptions);
promise.done((data) => {
abortCurrentRequests[section] = abortRequest;
request.done((data) => {
dispatch(set({
section,
isTesting: false,
@ -27,11 +40,11 @@ function createTestProviderHandler(section, url, getFromState) {
}));
});
promise.fail((xhr) => {
request.fail((xhr) => {
dispatch(set({
section,
isTesting: false,
saveError: xhr
saveError: xhr.aborted ? null : xhr
}));
});
};

7
frontend/src/Store/Actions/actionTypes.js
View file

@ -247,8 +247,10 @@ export const SELECT_INDEXER_SCHEMA = 'SELECT_INDEXER_SCHEMA';
export const SET_INDEXER_VALUE = 'SET_INDEXER_VALUE';
export const SET_INDEXER_FIELD_VALUE = 'SET_INDEXER_FIELD_VALUE';
export const SAVE_INDEXER = 'SAVE_INDEXER';
export const CANCEL_SAVE_INDEXER = 'CANCEL_SAVE_INDEXER';
export const DELETE_INDEXER = 'DELETE_INDEXER';
export const TEST_INDEXER = 'TEST_INDEXER';
export const CANCEL_TEST_INDEXER = 'CANCEL_TEST_INDEXER';
export const FETCH_INDEXER_OPTIONS = 'FETCH_INDEXER_OPTIONS';
export const SET_INDEXER_OPTIONS_VALUE = 'SET_INDEXER_OPTIONS_VALUE';
@ -265,8 +267,10 @@ export const SELECT_DOWNLOAD_CLIENT_SCHEMA = 'SELECT_DOWNLOAD_CLIENT_SCHEMA';
export const SET_DOWNLOAD_CLIENT_VALUE = 'SET_DOWNLOAD_CLIENT_VALUE';
export const SET_DOWNLOAD_CLIENT_FIELD_VALUE = 'SET_DOWNLOAD_CLIENT_FIELD_VALUE';
export const SAVE_DOWNLOAD_CLIENT = 'SAVE_DOWNLOAD_CLIENT';
export const CANCEL_SAVE_DOWNLOAD_CLIENT = 'CANCEL_SAVE_DOWNLOAD_CLIENT';
export const DELETE_DOWNLOAD_CLIENT = 'DELETE_DOWNLOAD_CLIENT';
export const TEST_DOWNLOAD_CLIENT = 'TEST_DOWNLOAD_CLIENT';
export const CANCEL_TEST_DOWNLOAD_CLIENT = 'CANCEL_TEST_DOWNLOAD_CLIENT';
export const FETCH_DOWNLOAD_CLIENT_OPTIONS = 'FETCH_DOWNLOAD_CLIENT_OPTIONS';
export const SET_DOWNLOAD_CLIENT_OPTIONS_VALUE = 'SET_DOWNLOAD_CLIENT_OPTIONS_VALUE';
@ -283,8 +287,9 @@ export const SELECT_NOTIFICATION_SCHEMA = 'SELECT_NOTIFICATION_SCHEMA';
export const SET_NOTIFICATION_VALUE = 'SET_NOTIFICATION_VALUE';
export const SET_NOTIFICATION_FIELD_VALUE = 'SET_NOTIFICATION_FIELD_VALUE';
export const SAVE_NOTIFICATION = 'SAVE_NOTIFICATION';
export const CANCEL_SAVE_NOTIFICATION = 'CANCEL_SAVE_NOTIFICATION';
export const DELETE_NOTIFICATION = 'DELETE_NOTIFICATION';
export const TEST_NOTIFICATION = 'TEST_NOTIFICATION';
export const CANCEL_TEST_NOTIFICATION = 'CANCEL_TEST_NOTIFICATION';
export const FETCH_METADATA = 'FETCH_METADATA';
export const SET_METADATA_VALUE = 'SET_METADATA_VALUE';

24
frontend/src/Store/Actions/addArtistActionHandlers.js
View file

@ -1,12 +1,12 @@
import _ from 'lodash';
import $ from 'jquery';
import { batchActions } from 'redux-batched-actions';
import createAjaxRequest from 'Utilities/createAjaxRequest';
import getNewSeries from 'Utilities/Series/getNewSeries';
import * as types from './actionTypes';
import { set, update, updateItem } from './baseActions';
let currentXHR = null;
let xhrCancelled = false;
let abortCurrentRequest = null;
const section = 'addArtist';
const addArtistActionHandlers = {
@ -14,24 +14,20 @@ const addArtistActionHandlers = {
return function(dispatch, getState) {
dispatch(set({ section, isFetching: true }));
if (currentXHR) {
xhrCancelled = true;
currentXHR.abort();
currentXHR = null;
if (abortCurrentRequest) {
abortCurrentRequest();
}
currentXHR = new window.XMLHttpRequest();
xhrCancelled = false;
const promise = $.ajax({
const { request, abortRequest } = createAjaxRequest()({
url: '/artist/lookup',
xhr: () => currentXHR,
data: {
term: payload.term
}
});
promise.done((data) => {
abortCurrentRequest = abortRequest;
request.done((data) => {
dispatch(batchActions([
update({ section, data }),
@ -44,12 +40,12 @@ const addArtistActionHandlers = {
]));
});
promise.fail((xhr) => {
request.fail((xhr) => {
dispatch(set({
section,
isFetching: false,
isPopulated: false,
error: xhrCancelled ? null : xhr
error: xhr.aborted ? null : xhr
}));
});
};

16
frontend/src/Store/Actions/settingsActionHandlers.js
View file

@ -5,9 +5,9 @@ import * as types from './actionTypes';
import createFetchHandler from './Creators/createFetchHandler';
import createFetchSchemaHandler from './Creators/createFetchSchemaHandler';
import createSaveHandler from './Creators/createSaveHandler';
import createSaveProviderHandler from './Creators/createSaveProviderHandler';
import createSaveProviderHandler, { createCancelSaveProviderHandler } from './Creators/createSaveProviderHandler';
import createRemoveItemHandler from './Creators/createRemoveItemHandler';
import createTestProviderHandler from './Creators/createTestProviderHandler';
import createTestProviderHandler, { createCancelTestProviderHandler } from './Creators/createTestProviderHandler';
import { set, update, clearPendingChanges } from './baseActions';
const settingsActionHandlers = {
@ -161,6 +161,8 @@ const settingsActionHandlers = {
'/indexer',
(state) => state.settings.indexers),
[types.CANCEL_SAVE_INDEXER]: createCancelSaveProviderHandler('indexers'),
[types.DELETE_INDEXER]: createRemoveItemHandler('indexers',
'/indexer',
(state) => state.settings.indexers),
@ -169,6 +171,8 @@ const settingsActionHandlers = {
'/indexer',
(state) => state.settings.indexers),
[types.CANCEL_TEST_INDEXER]: createCancelTestProviderHandler('indexers'),
[types.FETCH_INDEXER_OPTIONS]: createFetchHandler('indexerOptions', '/config/indexer'),
[types.SAVE_INDEXER_OPTIONS]: createSaveHandler('indexerOptions', '/config/indexer', (state) => state.settings.indexerOptions),
@ -189,6 +193,8 @@ const settingsActionHandlers = {
'/downloadclient',
(state) => state.settings.downloadClients),
[types.CANCEL_SAVE_DOWNLOAD_CLIENT]: createCancelSaveProviderHandler('downloadClients'),
[types.DELETE_DOWNLOAD_CLIENT]: createRemoveItemHandler('downloadClients',
'/downloadclient',
(state) => state.settings.downloadClients),
@ -197,6 +203,8 @@ const settingsActionHandlers = {
'/downloadclient',
(state) => state.settings.downloadClients),
[types.CANCEL_TEST_DOWNLOAD_CLIENT]: createCancelTestProviderHandler('downloadClients'),
[types.FETCH_DOWNLOAD_CLIENT_OPTIONS]: createFetchHandler('downloadClientOptions', '/config/downloadclient'),
[types.SAVE_DOWNLOAD_CLIENT_OPTIONS]: createSaveHandler('downloadClientOptions', '/config/downloadclient', (state) => state.settings.downloadClientOptions),
@ -217,6 +225,8 @@ const settingsActionHandlers = {
'/notification',
(state) => state.settings.notifications),
[types.CANCEL_SAVE_NOTIFICATION]: createCancelSaveProviderHandler('notifications'),
[types.DELETE_NOTIFICATION]: createRemoveItemHandler('notifications',
'/notification',
(state) => state.settings.notifications),
@ -225,6 +235,8 @@ const settingsActionHandlers = {
'/notification',
(state) => state.settings.notifications),
[types.CANCEL_TEST_NOTIFICATION]: createCancelTestProviderHandler('notifications'),
[types.FETCH_METADATA]: createFetchHandler('metadata', '/metadata'),
[types.SAVE_METADATA]: createSaveProviderHandler('metadata',

6
frontend/src/Store/Actions/settingsActions.js
View file

@ -79,8 +79,10 @@ export const fetchIndexerSchema = settingsActionHandlers[types.FETCH_INDEXER_SCH
export const selectIndexerSchema = createAction(types.SELECT_INDEXER_SCHEMA);
export const saveIndexer = settingsActionHandlers[types.SAVE_INDEXER];
export const cancelSaveIndexer = settingsActionHandlers[types.CANCEL_SAVE_INDEXER];
export const deleteIndexer = settingsActionHandlers[types.DELETE_INDEXER];
export const testIndexer = settingsActionHandlers[types.TEST_INDEXER];
export const cancelTestIndexer = settingsActionHandlers[types.CANCEL_TEST_INDEXER];
export const setIndexerValue = createAction(types.SET_INDEXER_VALUE, (payload) => {
return {
@ -121,8 +123,10 @@ export const fetchDownloadClientSchema = settingsActionHandlers[types.FETCH_DOWN
export const selectDownloadClientSchema = createAction(types.SELECT_DOWNLOAD_CLIENT_SCHEMA);
export const saveDownloadClient = settingsActionHandlers[types.SAVE_DOWNLOAD_CLIENT];
export const cancelSaveDownloadClient = settingsActionHandlers[types.CANCEL_SAVE_DOWNLOAD_CLIENT];
export const deleteDownloadClient = settingsActionHandlers[types.DELETE_DOWNLOAD_CLIENT];
export const testDownloadClient = settingsActionHandlers[types.TEST_DOWNLOAD_CLIENT];
export const cancelTestDownloadClient = settingsActionHandlers[types.CANCEL_TEST_DOWNLOAD_CLIENT];
export const setDownloadClientValue = createAction(types.SET_DOWNLOAD_CLIENT_VALUE, (payload) => {
return {
@ -163,8 +167,10 @@ export const fetchNotificationSchema = settingsActionHandlers[types.FETCH_NOTIFI
export const selectNotificationSchema = createAction(types.SELECT_NOTIFICATION_SCHEMA);
export const saveNotification = settingsActionHandlers[types.SAVE_NOTIFICATION];
export const cancelSaveNotification = settingsActionHandlers[types.CANCEL_SAVE_NOTIFICATION];
export const deleteNotification = settingsActionHandlers[types.DELETE_NOTIFICATION];
export const testNotification = settingsActionHandlers[types.TEST_NOTIFICATION];
export const cancelTestNotification = settingsActionHandlers[types.CANCEL_TEST_NOTIFICATION];
export const setNotificationValue = createAction(types.SET_NOTIFICATION_VALUE, (payload) => {
return {