ODWRTW/canape
2
2
Fork 0
Code Issues 3 Pull Requests 1 Releases Activity

Keep the last shows fetched URL

Browse Source
This commit is contained in:
Grégoire Delattre 2017-05-20 00:08:07 +02:00
parent fce19bf3d8
commit 614d1ab11e
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/public/js/actions/actionCreators.js
View File

@ -175,14 +175,10 @@ export function fetchMovies(url) {
export function fetchShows(url) { export function fetchShows(url) {
return request( return request(
'SHOW_LIST_FETCH', 'SHOW_LIST_FETCH',
configureAxios().get(url) configureAxios().get(url),
) [
} updateLastShowsFetchUrl(url),
]
export function searchShows(search) {
return request(
'SEARCH_SHOWS',
configureAxios().post('/shows/search', search)
) )
} }
@ -256,13 +252,6 @@ export function updateShowWishlistStore(imdbId, wishlisted, season = null, episo
} }
} }
export function exploreShows(source, category) {
return request(
'EXPLORE_SHOWS',
configureAxios().get(`/shows/explore?source=${encodeURI(source)}&category=${encodeURI(category)}`)
)
}
export function getShowExploreOptions() { export function getShowExploreOptions() {
return request( return request(
'SHOW_GET_EXPLORE_OPTIONS', 'SHOW_GET_EXPLORE_OPTIONS',
@ -277,6 +266,15 @@ export function selectShow(imdbId) {
} }
} }
export function updateLastShowsFetchUrl(url) {
return {
type: 'UPDATE_LAST_SHOWS_FETCH_URL',
payload: {
url: url,
},
}
}
// ====================== // ======================
// AddTorrent // AddTorrent
// ====================== // ======================

8
src/public/js/app.js
View File

@ -133,7 +133,9 @@ const routes = {
if (Object.keys(state.movieStore.exploreOptions).length === 0) { if (Object.keys(state.movieStore.exploreOptions).length === 0) {
store.dispatch(actionCreators.getMovieExploreOptions()); store.dispatch(actionCreators.getMovieExploreOptions());
} }
store.dispatch(actionCreators.fetchMovies(`/movies/explore?source=${nextState.params.source}&category=${nextState.params.category}`)); store.dispatch(actionCreators.fetchMovies(
`/movies/explore?source=${encodeURI(nextState.params.source)}&category=${encodeURI(nextState.params.category)}`
));
}); });
}, },
}, },
@ -192,7 +194,9 @@ const routes = {
if (Object.keys(state.showStore.exploreOptions).length === 0) { if (Object.keys(state.showStore.exploreOptions).length === 0) {
store.dispatch(actionCreators.getShowExploreOptions()); store.dispatch(actionCreators.getShowExploreOptions());
} }
store.dispatch(actionCreators.fetchShows(`/shows/explore?source=${nextState.params.source}&category=${nextState.params.category}`)); store.dispatch(actionCreators.fetchShows(
`/shows/explore?source=${encodeURI(nextState.params.source)}&category=${encodeURI(nextState.params.category)}`
));
}); });
}, },
}, },

5
src/public/js/reducers/shows.js
View File

@ -9,6 +9,7 @@ const defaultState = {
}, },
search: "", search: "",
getDetails: false, getDetails: false,
lastShowsFetchUrl: "",
exploreOptions: {}, exploreOptions: {},
}; };
@ -73,6 +74,10 @@ export default function showStore(state = defaultState, action) {
shows: updateShowsStoreWishlist(state.shows.slice(), action.payload), shows: updateShowsStoreWishlist(state.shows.slice(), action.payload),
show: updateShowStoreWishlist(Object.assign({}, state.show), action.payload), show: updateShowStoreWishlist(Object.assign({}, state.show), action.payload),
}) })
case 'UPDATE_LAST_SHOWS_FETCH_URL':
return Object.assign({}, state, {
lastShowsFetchUrl: action.payload.url,
})
case 'SELECT_SHOW': case 'SELECT_SHOW':
// Don't select the show if we're fetching another show's details // Don't select the show if we're fetching another show's details
if (state.fetchingDetails) { if (state.fetchingDetails) {