Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix forced search and subtitle search #4751

Merged
merged 4 commits into from
Jul 25, 2018
Merged

Fix forced search and subtitle search #4751

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4066a0f
Remove unused Python imports
sharkykh Jul 24, 2018
77ab9c9
displayShow: Moved JS to mako
sharkykh Jul 25, 2018
02c572c
Fix schedule forced search
sharkykh Jul 25, 2018
ece5a99
subtitleMissedPP subtitle search
sharkykh Jul 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
441 changes: 0 additions & 441 deletions themes-default/slim/static/js/home/display-show.js
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions themes-default/slim/static/js/manage/subtitle-missed-post-process.js
View file
Open in desktop

This file was deleted.

446 changes: 441 additions & 5 deletions themes-default/slim/views/displayShow.mako
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 0 additions & 2 deletions themes-default/slim/views/layouts/main.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@

<script type="text/javascript" src="js/common/init.js?${sbPID}"></script>

<script type="text/javascript" src="js/home/display-show.js?${sbPID}"></script>
<script type="text/javascript" src="js/home/index.js?${sbPID}"></script>
<script type="text/javascript" src="js/home/post-process.js?${sbPID}"></script>
<script type="text/javascript" src="js/home/restart.js?${sbPID}"></script>
Expand All @@ -111,7 +110,6 @@
<script type="text/javascript" src="js/manage/index.js?${sbPID}"></script>
<script type="text/javascript" src="js/manage/init.js?${sbPID}"></script>
<script type="text/javascript" src="js/manage/subtitle-missed.js?${sbPID}"></script>
<script type="text/javascript" src="js/manage/subtitle-missed-post-process.js?${sbPID}"></script>

<script type="text/javascript" src="js/browser.js?${sbPID}"></script>

Expand Down
34 changes: 32 additions & 2 deletions themes-default/slim/views/manage_subtitleMissedPP.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<%inherit file="/layouts/main.mako"/>
<%!
from medusa import app
import os

from medusa import app
from medusa.helper.common import episode_num
%>
<%block name="scripts">
<script type="text/javascript" src="js/lib/jquery.bookmarkscroll.js?${sbPID}"></script>
<script type="text/javascript" src="js/ajax-episode-subtitles.js?${sbPID}"></script>
<script>
window.app = {};
Expand All @@ -20,6 +20,36 @@ const startVue = () => {
return {
header: 'Missing Subtitles in Post-Process folder'
};
},
mounted() {
this.$once('loaded', () => {
startAjaxEpisodeSubtitles(); // eslint-disable-line no-undef
$.ajaxEpSubtitlesSearch();
});

$('#releasesPP:has(tbody tr)').tablesorter({
sortList: [[3, 1], [0, 0]],
textExtraction: {
0(node) { return $(node).find('a').text().toLowerCase(); }, // eslint-disable-line brace-style
1(node) { return $(node).text().toLowerCase(); }, // eslint-disable-line brace-style
2(node) { return $(node).find('span').text().toLowerCase(); }, // eslint-disable-line brace-style
3(node) { return $(node).find('span').attr('datetime'); } // eslint-disable-line brace-style
},
widgets: ['saveSort', 'filter'],
headers: {
0: { sorter: 'show' },
1: { sorter: 'episode' },
2: { sorter: 'release' },
3: { sorter: 'realISODate' },
4: { sorter: false, filter: false }
},
widgetOptions: {
filter_columnFilters: true, // eslint-disable-line camelcase
filter_hideFilters: true, // eslint-disable-line camelcase
filter_saveFilters: true, // eslint-disable-line camelcase
columnSelector_mediaquery: false // eslint-disable-line camelcase
}
});
}
});
};
Expand Down
7 changes: 2 additions & 5 deletions themes-default/slim/views/partials/showheader.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<%!
import datetime
import urllib
import ntpath
import operator
from medusa import app, helpers, subtitles, sbdatetime, network_timezones
from medusa.common import SKIPPED, WANTED, UNAIRED, ARCHIVED, IGNORED, FAILED, DOWNLOADED
from medusa import app, helpers, subtitles, network_timezones
from medusa.common import SKIPPED, WANTED, ARCHIVED, IGNORED, FAILED, DOWNLOADED
from medusa.common import Quality, qualityPresets, statusStrings, Overview
from medusa.helper.common import pretty_file_size
from medusa.indexers.indexer_api import indexerApi
Expand Down
3 changes: 1 addition & 2 deletions themes-default/slim/views/schedule.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ const startVue = () => {
const { $store, $route } = this;
// $store.dispatch('getShows');

const unwatch = this.$watch('layout', () => {
unwatch();
this.$once('loaded', () => {
const { config, layout } = this;
if (layout === 'list') {
const sortCodes = {
Expand Down
Loading