Merge remote-tracking branch 'origin/development' into development

pull/1416/head
morpheus65535 4 years ago
commit c2eec34aff

@ -53,12 +53,12 @@ def blacklist_log(sonarr_series_id, sonarr_episode_id, provider, subs_id, langua
def blacklist_delete(provider, subs_id):
database.execute("DELETE FROM table_blacklist WHERE provider=? AND subs_id=?", (provider, subs_id))
event_stream(type='episode-blacklist')
event_stream(type='episode-blacklist', action='delete')
def blacklist_delete_all():
database.execute("DELETE FROM table_blacklist")
event_stream(type='episode-blacklist')
event_stream(type='episode-blacklist', action='delete')
def history_log_movie(action, radarr_id, description, video_path=None, language=None, provider=None, score=None,
@ -77,12 +77,12 @@ def blacklist_log_movie(radarr_id, provider, subs_id, language):
def blacklist_delete_movie(provider, subs_id):
database.execute("DELETE FROM table_blacklist_movie WHERE provider=? AND subs_id=?", (provider, subs_id))
event_stream(type='movie-blacklist')
event_stream(type='movie-blacklist', action='delete')
def blacklist_delete_all_movie():
database.execute("DELETE FROM table_blacklist_movie")
event_stream(type='movie-blacklist')
event_stream(type='movie-blacklist', action='delete')
@region.cache_on_arguments()

@ -362,7 +362,7 @@ export function useBlacklistMovies() {
const update = useReduxAction(movieUpdateBlacklist);
const items = useReduxStore((d) => d.movie.blacklist);
const reducer = useMemo<SocketIO.Reducer>(
() => ({ key: "movie-blacklist", update }),
() => ({ key: "movie-blacklist", any: update }),
[update]
);
useSocketIOReducer(reducer);
@ -377,7 +377,7 @@ export function useBlacklistSeries() {
const update = useReduxAction(seriesUpdateBlacklist);
const items = useReduxStore((d) => d.series.blacklist);
const reducer = useMemo<SocketIO.Reducer>(
() => ({ key: "episode-blacklist", update }),
() => ({ key: "episode-blacklist", any: update }),
[update]
);
useSocketIOReducer(reducer);

Loading…
Cancel
Save