michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

finish open subtitle config page

Browse Source
This commit is contained in:
Luke Pulverenti 2014-05-07 16:16:57 -04:00
parent 9e4b34a4b1
commit d5b1730a7a
5 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Model/Configuration/ServerConfiguration.cs
View File

@ -319,7 +319,7 @@ namespace MediaBrowser.Model.Configuration
public class SubtitleOptions
{
public bool RequireExternalSubtitles { get; set; }
public string[] SubtitleDownloadLanguages { get; set; }
public string[] DownloadLanguages { get; set; }
public bool DownloadMovieSubtitles { get; set; }
public bool DownloadEpisodeSubtitles { get; set; }
@ -328,7 +328,7 @@ namespace MediaBrowser.Model.Configuration
public SubtitleOptions()
{
SubtitleDownloadLanguages = new string[] { };
DownloadLanguages = new string[] { };
}
}
}

2
MediaBrowser.Providers/MediaInfo/FFProbeVideoInfo.cs
View File

@ -473,7 +473,7 @@ namespace MediaBrowser.Providers.MediaInfo
currentStreams,
externalSubtitleStreams,
_config.Configuration.SubtitleOptions.RequireExternalSubtitles,
_config.Configuration.SubtitleOptions.SubtitleDownloadLanguages,
_config.Configuration.SubtitleOptions.DownloadLanguages,
cancellationToken).ConfigureAwait(false);
// Rescan

8
MediaBrowser.Providers/Subtitles/OpenSubtitleDownloader.cs
View File

@ -127,8 +127,14 @@ namespace MediaBrowser.Providers.Subtitles
};
}
private DateTime _lastLogin;
private async Task Login(CancellationToken cancellationToken)
{
if ((DateTime.UtcNow - _lastLogin).TotalSeconds < 60)
{
return;
}
var options = _config.Configuration.SubtitleOptions ?? new SubtitleOptions();
var user = options.OpenSubtitlesUsername ?? string.Empty;
@ -140,6 +146,8 @@ namespace MediaBrowser.Providers.Subtitles
{
throw new UnauthorizedAccessException("Authentication to OpenSubtitles failed.");
}
_lastLogin = DateTime.UtcNow;
}
public async Task<IEnumerable<RemoteSubtitleInfo>> SearchSubtitles(SubtitleSearchRequest request, CancellationToken cancellationToken)

5
MediaBrowser.Server.Implementations/Localization/Server/server.json
View File

@ -712,5 +712,8 @@
"TabSubtitles": "Subtitles",
"LabelOpenSubtitlesUsername": "Open Subtitles username:",
"LabelOpenSubtitlesPassword": "Open Subtitles password:",
"LabelAudioLanguagePreferenceHelp": "If empty, the default audio track will be selected, regardless of language."
"LabelAudioLanguagePreferenceHelp": "If empty, the default audio track will be selected, regardless of language.",
"LabelDownloadLanguages": "Download languages:",
"ButtonRegister": "Register",
"HeaderSubtitleDownloadingMoreHelp": "Subtitles are considered missing when the audio track is in a foreign language, and there are no subtitles available in the preferred language."
}

3
MediaBrowser.ServerApplication/MainStartup.cs
View File

@ -111,6 +111,7 @@ namespace MediaBrowser.ServerApplication
/// <summary>
/// Determines whether [is already running] [the specified current process].
/// </summary>
/// <param name="applicationPath">The application path.</param>
/// <param name="currentProcess">The current process.</param>
/// <returns><c>true</c> if [is already running] [the specified current process]; otherwise, <c>false</c>.</returns>
private static bool IsAlreadyRunning(string applicationPath, Process currentProcess)
@ -131,7 +132,7 @@ namespace MediaBrowser.ServerApplication
{
_logger.Info("Found a duplicate process. Giving it time to exit.");
if (!duplicate.WaitForExit(5000))
if (!duplicate.WaitForExit(10000))
{
_logger.Info("The duplicate process did not exit.");
return true;