@@ -86,6 +87,10 @@ export default {
episode: {
type: [String, Number],
required: true
+ },
+ lang: {
+ type: String,
+ required: false
}
},
data() {
@@ -147,12 +152,17 @@ export default {
},
methods: {
autoSearch() {
- const { subtitleParams } = this;
+ const { lang, subtitleParams } = this;
+ const params = subtitleParams;
+
+ if (lang !== undefined) {
+ params.lang = lang;
+ }
this.displayQuestion = false;
this.loadingMessage = 'Searching for subtitles and downloading if available... ';
this.loading = true;
- apiRoute('home/searchEpisodeSubtitles', { params: subtitleParams })
+ apiRoute('home/searchEpisodeSubtitles', { params })
.then(response => {
if (response.data.result !== 'failure') {
// Update the show, as we have new information (subtitles)
@@ -191,6 +201,31 @@ export default {
this.loading = false;
});
},
+ redownloadLang() {
+ const { subtitleParams } = this;
+
+ apiRoute('home/searchEpisodeSubtitles', { params: subtitleParams })
+ .then(response => {
+ if (response.data.result !== 'failure') {
+ // Update the show, as we have new information (subtitles)
+ // Let's emit an event, telling the displayShow component, to update the show using the api/store.
+ this.$emit('update', {
+ reason: 'new subtitles found',
+ codes: response.data.subtitles,
+ languages: response.data.languages
+ });
+ }
+ })
+ .catch(error => {
+ console.log(`Error trying to search for subtitles. Error: ${error}`);
+ })
+ .finally(() => {
+ // Cleanup
+ this.loadingMessage = '';
+ this.loading = false;
+ this.close();
+ });
+ },
pickSubtitle(subtitleId) {
// Download and save this subtitle with the episode.
const { subtitleParams } = this;
diff --git a/themes-default/slim/src/global-vue-shim.js b/themes-default/slim/src/global-vue-shim.js
index e35500f9bc..0decba34ad 100644
--- a/themes-default/slim/src/global-vue-shim.js
+++ b/themes-default/slim/src/global-vue-shim.js
@@ -3,6 +3,9 @@ import Vue from 'vue';
import AsyncComputed from 'vue-async-computed';
import VueMeta from 'vue-meta';
import Snotify from 'vue-snotify';
+import VueCookies from 'vue-cookies';
+import VModal from 'vue-js-modal';
+import { VTooltip } from 'v-tooltip';
import {
AddShowOptions,
@@ -26,7 +29,6 @@ import {
RootDirs,
ScrollButtons,
SelectList,
- Show,
ShowSelector,
SnatchSelection,
StateSwitch,
@@ -84,7 +86,6 @@ export const registerGlobalComponents = () => {
components = components.concat([
Home,
ManualPostProcess,
- Show,
SnatchSelection,
Status
]);
@@ -105,6 +106,9 @@ export const registerPlugins = () => {
Vue.use(AsyncComputed);
Vue.use(VueMeta);
Vue.use(Snotify);
+ Vue.use(VueCookies);
+ Vue.use(VModal);
+ Vue.use(VTooltip);
};
/**
diff --git a/themes-default/slim/src/router/routes.js b/themes-default/slim/src/router/routes.js
index b7aac383fc..6bb8ca9dfa 100644
--- a/themes-default/slim/src/router/routes.js
+++ b/themes-default/slim/src/router/routes.js
@@ -31,7 +31,8 @@ const homeRoutes = [
meta: {
topMenu: 'home',
subMenu: showSubMenu
- }
+ },
+ component: () => import('../components/display-show.vue')
},
{
path: '/home/snatchSelection',
diff --git a/themes-default/slim/src/store/modules/config.js b/themes-default/slim/src/store/modules/config.js
index 5f561c4989..d427dad3a2 100644
--- a/themes-default/slim/src/store/modules/config.js
+++ b/themes-default/slim/src/store/modules/config.js
@@ -1,5 +1,6 @@
import { api } from '../../api';
import { ADD_CONFIG } from '../mutation-types';
+import { arrayUnique, arrayExclude } from '../../utils/core';
const state = {
wikiUrl: null,
@@ -39,8 +40,7 @@ const state = {
layout: {
show: {
specials: null,
- showListOrder: [],
- allSeasons: null
+ showListOrder: []
},
home: null,
history: null,
@@ -241,6 +241,23 @@ const mutations = {
};
const getters = {
+ layout: state => layout => state.layout[layout],
+ effectiveIgnored: (state, _, rootState) => series => {
+ const seriesIgnored = series.config.release.ignoredWords.map(x => x.toLowerCase());
+ const globalIgnored = rootState.search.filters.ignored.map(x => x.toLowerCase());
+ if (!series.config.release.ignoredWordsExclude) {
+ return arrayUnique(globalIgnored.concat(seriesIgnored));
+ }
+ return arrayExclude(globalIgnored, seriesIgnored);
+ },
+ effectiveRequired: (state, _, rootState) => series => {
+ const globalRequired = rootState.search.filters.required.map(x => x.toLowerCase());
+ const seriesRequired = series.config.release.requiredWords.map(x => x.toLowerCase());
+ if (!series.config.release.requiredWordsExclude) {
+ return arrayUnique(globalRequired.concat(seriesRequired));
+ }
+ return arrayExclude(globalRequired, seriesRequired);
+ },
// Get an indexer's name using its ID.
indexerIdToName: state => indexerId => {
if (!indexerId) {
@@ -256,9 +273,6 @@ const getters = {
}
const { indexers } = state.indexers.config;
return indexers[name].id;
- },
- layout: state => layout => {
- return state.layout[layout];
}
};
diff --git a/themes-default/slim/src/store/modules/consts.js b/themes-default/slim/src/store/modules/consts.js
index 5d46990c79..2d8cee6844 100644
--- a/themes-default/slim/src/store/modules/consts.js
+++ b/themes-default/slim/src/store/modules/consts.js
@@ -54,6 +54,37 @@ const getters = {
}
return state.statuses.find(status => key === status.key || value === status.value);
},
+ // Get an episode overview status using the episode status and quality
+ // eslint-disable-next-line no-unused-vars
+ getOverviewStatus: _state => (status, quality, showQualities) => {
+ if (['Unset', 'Unaired'].includes(status)) {
+ return 'Unaired';
+ }
+
+ if (['Skipped', 'Ignored'].includes(status)) {
+ return 'Skipped';
+ }
+
+ if (['Wanted', 'Failed'].includes(status)) {
+ return 'Wanted';
+ }
+
+ if (['Snatched', 'Snatched (Proper)', 'Snatched (Best)'].includes(status)) {
+ return 'Snatched';
+ }
+
+ if (['Downloaded'].includes(status)) {
+ if (showQualities.preferred.includes(quality)) {
+ return 'Preferred';
+ }
+
+ if (showQualities.allowed.includes(quality)) {
+ return 'Allowed';
+ }
+ }
+
+ return status;
+ },
splitQuality: state => {
/**
* Split a combined quality to allowed and preferred qualities.
diff --git a/themes-default/slim/src/store/modules/shows.js b/themes-default/slim/src/store/modules/shows.js
index bd97a6995a..623c9a90c0 100644
--- a/themes-default/slim/src/store/modules/shows.js
+++ b/themes-default/slim/src/store/modules/shows.js
@@ -1,7 +1,7 @@
import Vue from 'vue';
import { api } from '../../api';
-import { ADD_SHOW } from '../mutation-types';
+import { ADD_SHOW, ADD_SHOW_EPISODE } from '../mutation-types';
/**
* @typedef {object} ShowIdentifier
@@ -43,7 +43,46 @@ const mutations = {
currentShow(state, { indexer, id }) {
state.currentShow.indexer = indexer;
state.currentShow.id = id;
+ },
+ [ADD_SHOW_EPISODE](state, { show, episodes }) {
+ // Creating a new show object (from the state one) as we want to trigger a store update
+ const newShow = Object.assign({}, state.shows.find(({ id, indexer }) => Number(show.id[show.indexer]) === Number(id[indexer])));
+
+ if (!newShow.seasons) {
+ newShow.seasons = [];
+ }
+
+ // Recreate an Array with season objects, with each season having an episodes array.
+ // This format is used by vue-good-table (displayShow).
+ episodes.forEach(episode => {
+ const existingSeason = newShow.seasons.find(season => season.season === episode.season);
+
+ if (existingSeason) {
+ const foundIndex = existingSeason.episodes.findIndex(element => element.slug === episode.slug);
+ if (foundIndex === -1) {
+ existingSeason.episodes.push(episode);
+ } else {
+ existingSeason.episodes.splice(foundIndex, 1, episode);
+ }
+ } else {
+ const newSeason = {
+ season: episode.season,
+ episodes: [],
+ html: false,
+ mode: 'span',
+ label: 1
+ };
+ newShow.seasons.push(newSeason);
+ newSeason.episodes.push(episode);
+ }
+ });
+
+ // Update state
+ const existingShow = state.shows.find(({ id, indexer }) => Number(show.id[show.indexer]) === Number(id[indexer]));
+ Vue.set(state.shows, state.shows.indexOf(existingShow), newShow);
+ console.log(`Storing episodes for show ${newShow.title} seasons: ${[...new Set(episodes.map(episode => episode.season))].join(', ')}`);
}
+
};
const getters = {
@@ -96,6 +135,7 @@ const actions = {
if (detailed !== undefined) {
params.detailed = detailed;
timeout = 60000;
+ timeout = 60000;
}
if (episodes !== undefined) {
@@ -113,6 +153,39 @@ const actions = {
});
});
},
+ /**
+ * Get episdoes for a specified show from API and commit it to the store.
+ *
+ * @param {*} context - The store context.
+ * @param {ShowParameteres} parameters - Request parameters.
+ * @returns {Promise} The API response.
+ */
+ getEpisodes({ commit, getters }, { indexer, id, season }) {
+ return new Promise((resolve, reject) => {
+ const { getShowById } = getters;
+ const show = getShowById({ id, indexer });
+
+ const limit = 1000;
+ const params = {
+ limit
+ };
+
+ if (season) {
+ params.season = season;
+ }
+
+ // Get episodes
+ api.get(`/series/${indexer}${id}/episodes`, { params })
+ .then(response => {
+ commit(ADD_SHOW_EPISODE, { show, episodes: response.data });
+ resolve();
+ })
+ .catch(error => {
+ console.log(`Could not retrieve a episodes for show ${indexer}${id}, error: ${error}`);
+ reject(error);
+ });
+ });
+ },
/**
* Get shows from API and commit them to the store.
*
diff --git a/themes-default/slim/src/store/mutation-types.js b/themes-default/slim/src/store/mutation-types.js
index 07f1fe79ad..80ec36a2f0 100644
--- a/themes-default/slim/src/store/mutation-types.js
+++ b/themes-default/slim/src/store/mutation-types.js
@@ -14,6 +14,7 @@ const NOTIFICATIONS_ENABLED = '🔔 Notifications Enabled';
const NOTIFICATIONS_DISABLED = '🔔 Notifications Disabled';
const ADD_CONFIG = '⚙️ Config added to store';
const ADD_SHOW = '📺 Show added to store';
+const ADD_SHOW_EPISODE = '📺 Shows season with episodes added to store';
const ADD_STATS = 'ℹ️ Statistics added to store';
export {
@@ -33,5 +34,6 @@ export {
NOTIFICATIONS_DISABLED,
ADD_CONFIG,
ADD_SHOW,
+ ADD_SHOW_EPISODE,
ADD_STATS
};
diff --git a/themes-default/slim/src/utils/jquery.js b/themes-default/slim/src/utils/jquery.js
index 894ff11503..6ba9e954c9 100644
--- a/themes-default/slim/src/utils/jquery.js
+++ b/themes-default/slim/src/utils/jquery.js
@@ -97,26 +97,26 @@ export const updateSearchIcons = (showSlug, vm) => {
const queuedImage = 'queued.png';
const searchImage = 'search16.png';
- if (`${ep.indexer_name}${ep.series_id}` !== vm.show.id.slug) {
+ if (ep.show.slug !== vm.show.id.slug) {
return true;
}
// Try to get the
Element
- const img = vm.$refs[`search-${ep.slug}`];
+ const img = vm.$refs[`search-${ep.episode.slug}`];
if (img) {
- if (ep.searchstatus.toLowerCase() === 'searching') {
+ if (ep.search.status.toLowerCase() === 'searching') {
// El=$('td#' + ep.season + 'x' + ep.episode + '.search img');
img.title = 'Searching';
img.alt = 'Searching';
img.src = 'images/' + loadingImage;
disableLink(img);
- } else if (ep.searchstatus.toLowerCase() === 'queued') {
+ } else if (ep.search.status.toLowerCase() === 'queued') {
// El=$('td#' + ep.season + 'x' + ep.episode + '.search img');
img.title = 'Queued';
img.alt = 'queued';
img.src = 'images/' + queuedImage;
disableLink(img);
- } else if (ep.searchstatus.toLowerCase() === 'finished') {
+ } else if (ep.search.status.toLowerCase() === 'finished') {
// El=$('td#' + ep.season + 'x' + ep.episode + '.search img');
img.title = 'Searching';
img.alt = 'searching';
diff --git a/themes-default/slim/static/css/dark.css b/themes-default/slim/static/css/dark.css
index ef79f793e4..3541ec9067 100644
--- a/themes-default/slim/static/css/dark.css
+++ b/themes-default/slim/static/css/dark.css
@@ -663,6 +663,25 @@ body {
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
}
+/* Vueified DisplayShow uses the vue component vue-good-table to display tables. */
+.vgt-dropdown-menu {
+ background-color: rgb(41, 41, 41);
+ border: 1px solid rgba(0, 0, 0, 0.15);
+ box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
+}
+
+.vgt-dropdown-menu > li > span:hover,
+.vgt-dropdown-menu > li > span:focus {
+ color: rgb(255, 255, 255);
+ text-decoration: none;
+ background-color: rgb(119, 119, 119);
+}
+
+.vgt-dropdown-menu > li > span {
+ padding: 4px 36px 4px 20px;
+ color: rgb(255, 255, 255);
+}
+
/* submenu styling */
#sub-menu-container {
background-color: rgb(41, 41, 41);
diff --git a/themes-default/slim/static/css/style.css b/themes-default/slim/static/css/style.css
index 4a410ad4f7..53540c45af 100644
--- a/themes-default/slim/static/css/style.css
+++ b/themes-default/slim/static/css/style.css
@@ -1383,6 +1383,10 @@ ul.tags li a {
background-color: rgb(195, 227, 200);
}
+.archived {
+ background-color: rgb(195, 227, 200);
+}
+
.qual {
background-color: rgb(255, 218, 138);
}
@@ -2786,6 +2790,26 @@ fieldset[disabled] .navbar-default .btn-link:focus {
box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
}
+/* Vueified DisplayShow uses the vue component vue-good-table to display tables. */
+
+.vgt-dropdown-menu {
+ background-color: rgb(245, 241, 228);
+ border: 1px solid rgba(0, 0, 0, 0.15);
+ box-shadow: 0 6px 12px rgba(0, 0, 0, 0.176);
+}
+
+.vgt-dropdown-menu > li > a:hover,
+.vgt-dropdown-menu > li > a:focus {
+ color: rgb(38, 38, 38);
+ text-decoration: none;
+ background-color: rgb(245, 245, 245);
+}
+
+.vgt-dropdown-menu > li > span {
+ padding: 4px 36px 4px 20px;
+ color: #333;
+}
+
.form-control {
color: rgb(0, 0, 0);
}
diff --git a/themes-default/slim/static/images/notwatched.png b/themes-default/slim/static/images/notwatched.png
new file mode 100644
index 0000000000..03e44cd495
Binary files /dev/null and b/themes-default/slim/static/images/notwatched.png differ
diff --git a/themes-default/slim/static/images/watched.png b/themes-default/slim/static/images/watched.png
new file mode 100644
index 0000000000..c392829573
Binary files /dev/null and b/themes-default/slim/static/images/watched.png differ
diff --git a/themes-default/slim/static/js/ajax-episode-search.js b/themes-default/slim/static/js/ajax-episode-search.js
index 07f898b33b..841472ada6 100644
--- a/themes-default/slim/static/js/ajax-episode-search.js
+++ b/themes-default/slim/static/js/ajax-episode-search.js
@@ -1,7 +1,3 @@
-const searchStatusUrl = 'home/getManualSearchStatus';
-let failedDownload = false;
-let qualityDownload = false;
-let selectedEpisode = '';
PNotify.prototype.options.maxonscreen = 5;
$.fn.forcedSearches = [];
@@ -26,25 +22,25 @@ function updateImages(data) {
const searchImage = 'search16.png';
let htmlContent = '';
// Try to get the Element
- const el = $('a[id=' + ep.indexer_id + 'x' + ep.series_id + 'x' + ep.season + 'x' + ep.episode + ']');
+ const el = $('a[id=' + ep.show.indexer + 'x' + ep.show.series_id + 'x' + ep.episode.season + 'x' + ep.episode.episode + ']');
const img = el.children('img[data-ep-search]');
const parent = el.parent();
if (el) {
- if (ep.searchstatus.toLowerCase() === 'searching') {
+ if (ep.search.status.toLowerCase() === 'searching') {
// El=$('td#' + ep.season + 'x' + ep.episode + '.search img');
img.prop('title', 'Searching');
img.prop('alt', 'Searching');
img.prop('src', 'images/' + loadingImage);
disableLink(el);
- htmlContent = ep.searchstatus;
- } else if (ep.searchstatus.toLowerCase() === 'queued') {
+ htmlContent = ep.search.status;
+ } else if (ep.search.status.toLowerCase() === 'queued') {
// El=$('td#' + ep.season + 'x' + ep.episode + '.search img');
img.prop('title', 'Queued');
img.prop('alt', 'queued');
img.prop('src', 'images/' + queuedImage);
disableLink(el);
- htmlContent = ep.searchstatus;
- } else if (ep.searchstatus.toLowerCase() === 'finished') {
+ htmlContent = ep.search.status;
+ } else if (ep.search.status.toLowerCase() === 'finished') {
// El=$('td#' + ep.season + 'x' + ep.episode + '.search img');
img.prop('title', 'Searching');
img.prop('alt', 'searching');
@@ -54,34 +50,34 @@ function updateImages(data) {
// Update Status and Quality
let qualityPill = '';
- if (ep.quality_style !== 'na') {
+ if (ep.episode.quality_style !== 'na') {
// @FIXME: (sharkykh) This is a hack to get the QualityPill's scoped style to work.
const qualityPillScopeId = window.Vue.options.components['quality-pill'].options._scopeId;
- qualityPill = ' ' + ep.quality_name + '';
+ qualityPill = ' ' + ep.episode.quality_name + '';
}
- htmlContent = ep.status + qualityPill;
- parent.closest('tr').prop('class', ep.overview + ' season-' + ep.season + ' seasonstyle');
+ htmlContent = ep.episode.status + qualityPill;
+ parent.closest('tr').prop('class', ep.episode.overview + ' season-' + ep.episode.season + ' seasonstyle');
}
// Update the status column if it exists
parent.siblings('.col-status').html(htmlContent);
}
- const elementCompleteEpisodes = $('a[id=forceUpdate-' + ep.indexer_id + 'x' + ep.series_id + 'x' + ep.season + 'x' + ep.episode + ']');
+ const elementCompleteEpisodes = $('a[id=forceUpdate-' + ep.show.indexer + 'x' + ep.show.series_id + 'x' + ep.episode.season + 'x' + ep.episode.episode + ']');
const imageCompleteEpisodes = elementCompleteEpisodes.children('img');
if (elementCompleteEpisodes) {
- if (ep.searchstatus.toLowerCase() === 'searching') {
+ if (ep.search.status.toLowerCase() === 'searching') {
imageCompleteEpisodes.prop('title', 'Searching');
imageCompleteEpisodes.prop('alt', 'Searching');
imageCompleteEpisodes.prop('src', 'images/' + loadingImage);
disableLink(elementCompleteEpisodes);
- } else if (ep.searchstatus.toLowerCase() === 'queued') {
+ } else if (ep.search.status.toLowerCase() === 'queued') {
imageCompleteEpisodes.prop('title', 'Queued');
imageCompleteEpisodes.prop('alt', 'queued');
imageCompleteEpisodes.prop('src', 'images/' + queuedImage);
- } else if (ep.searchstatus.toLowerCase() === 'finished') {
+ } else if (ep.search.status.toLowerCase() === 'finished') {
imageCompleteEpisodes.prop('title', 'Forced Search');
imageCompleteEpisodes.prop('alt', '[search]');
imageCompleteEpisodes.prop('src', 'images/' + searchImage);
- if (ep.overview.toLowerCase() === 'snatched') {
+ if (ep.episode.overview.toLowerCase() === 'snatched') {
elementCompleteEpisodes.closest('tr').remove();
} else {
enableLink(elementCompleteEpisodes);
@@ -93,6 +89,7 @@ function updateImages(data) {
function checkManualSearches() {
let pollInterval = 5000;
+ const searchStatusUrl = 'home/getManualSearchStatus';
// Try to get a indexer name and series id. If we can't get any, we request the manual search status for all shows.
const indexerName = $('#indexer-name').val();
@@ -143,7 +140,7 @@ $.ajaxEpSearch = function(options) {
return false;
}
- selectedEpisode = $(this);
+ $.selectedEpisode = $(this);
$('#forcedSearchModalFailed').modal('show');
});
@@ -151,19 +148,21 @@ $.ajaxEpSearch = function(options) {
function forcedSearch() {
let imageName;
let imageResult;
+ const failedDownload = false;
+ const qualityDownload = false;
- const parent = selectedEpisode.parent();
+ const parent = $.selectedEpisode.parent();
// Create var for anchor
- const link = selectedEpisode;
+ const link = $.selectedEpisode;
// Create var for img under anchor and set options for the loading gif
- const img = selectedEpisode.children('img');
+ const img = $.selectedEpisode.children('img');
img.prop('title', 'loading');
img.prop('alt', '');
img.prop('src', 'images/' + options.loadingImage);
- let url = selectedEpisode.prop('href');
+ let url = $.selectedEpisode.prop('href');
if (!failedDownload) {
url = url.replace('retryEpisode', 'searchEpisode');
@@ -212,7 +211,7 @@ $.ajaxEpSearch = function(options) {
return false;
}
- selectedEpisode = $(this);
+ $.selectedEpisode = $(this);
// @TODO: Replace this with an easier to read selector
if ($(this).parent().parent().children('.col-status').children('.quality').length > 0) {
@@ -240,14 +239,4 @@ $.ajaxEpSearch = function(options) {
window.location = url;
}
});
-
- $('#forcedSearchModalFailed .btn-medusa').on('click', function() {
- failedDownload = ($(this).text().toLowerCase() === 'yes');
- $('#forcedSearchModalQuality').modal('show');
- });
-
- $('#forcedSearchModalQuality .btn-medusa').on('click', function() {
- qualityDownload = ($(this).text().toLowerCase() === 'yes');
- forcedSearch();
- });
};
diff --git a/themes-default/slim/test/specs/__snapshots__/plot-info.spec.js.snap b/themes-default/slim/test/specs/__snapshots__/plot-info.spec.js.snap
index f4d20fbb13..5557de38f3 100644
--- a/themes-default/slim/test/specs/__snapshots__/plot-info.spec.js.snap
+++ b/themes-default/slim/test/specs/__snapshots__/plot-info.spec.js.snap
@@ -3,7 +3,8 @@
exports[`PlotInfo.test.js renders 1`] = `
{
localVue,
store,
propsData: {
- showSlug: '',
- season: '',
- episode: ''
+ description: 'This is an example for an episodes plot info'
}
});
diff --git a/themes-default/slim/views/config_general.mako b/themes-default/slim/views/config_general.mako
index 4465997f56..4fb033c0d3 100644
--- a/themes-default/slim/views/config_general.mako
+++ b/themes-default/slim/views/config_general.mako
@@ -328,16 +328,6 @@ window.app = new Vue({
+ 
+
+
+
+ {{props.formattedRow[props.column.field]}}
+
+
+
+
+
+ {{props.column.label}}
+
+
+ {{props.column.label}}
+
+
+ {{props.column.label}}
+
+
+
+ 
+