mirror of https://github.com/jellyfin/jellyfin.git
restore changes
This commit is contained in:
parent
869d0ee1f5
commit
1cf65f1a2e
|
@ -190,8 +190,8 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
var mediaStreams = mediaInfo.MediaStreams;
|
var mediaStreams = mediaInfo.MediaStreams;
|
||||||
|
|
||||||
video.TotalBitrate = mediaInfo.Bitrate;
|
video.TotalBitrate = mediaInfo.Bitrate;
|
||||||
video.FormatName = (mediaInfo.Container ?? string.Empty)
|
//video.FormatName = (mediaInfo.Container ?? string.Empty)
|
||||||
.Replace("matroska", "mkv", StringComparison.OrdinalIgnoreCase);
|
// .Replace("matroska", "mkv", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
// For dvd's this may not always be accurate, so don't set the runtime if the item already has one
|
// For dvd's this may not always be accurate, so don't set the runtime if the item already has one
|
||||||
var needToSetRuntime = video.VideoType != VideoType.Dvd || video.RunTimeTicks == null || video.RunTimeTicks.Value == 0;
|
var needToSetRuntime = video.VideoType != VideoType.Dvd || video.RunTimeTicks == null || video.RunTimeTicks.Value == 0;
|
||||||
|
@ -707,7 +707,7 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
|
|
||||||
// Try to eliminate menus and intros by skipping all files at the front of the list that are less than the minimum size
|
// Try to eliminate menus and intros by skipping all files at the front of the list that are less than the minimum size
|
||||||
// Once we reach a file that is at least the minimum, return all subsequent ones
|
// Once we reach a file that is at least the minimum, return all subsequent ones
|
||||||
var allVobs = new DirectoryInfo(root).EnumerateFiles("*", SearchOption.AllDirectories)
|
var allVobs = _fileSystem.GetFiles(root)
|
||||||
.Where(file => string.Equals(file.Extension, ".vob", StringComparison.OrdinalIgnoreCase))
|
.Where(file => string.Equals(file.Extension, ".vob", StringComparison.OrdinalIgnoreCase))
|
||||||
.OrderBy(i => i.FullName)
|
.OrderBy(i => i.FullName)
|
||||||
.ToList();
|
.ToList();
|
||||||
|
@ -776,4 +776,4 @@ namespace MediaBrowser.Providers.MediaInfo
|
||||||
return files.Select(i => i.FullName);
|
return files.Select(i => i.FullName);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -11,7 +11,7 @@ namespace MediaBrowser.ServerApplication
|
||||||
public class ServerNotifyIcon : IDisposable
|
public class ServerNotifyIcon : IDisposable
|
||||||
{
|
{
|
||||||
bool IsDisposing = false;
|
bool IsDisposing = false;
|
||||||
|
|
||||||
private NotifyIcon notifyIcon1;
|
private NotifyIcon notifyIcon1;
|
||||||
private ContextMenuStrip contextMenuStrip1;
|
private ContextMenuStrip contextMenuStrip1;
|
||||||
private ToolStripMenuItem cmdExit;
|
private ToolStripMenuItem cmdExit;
|
||||||
|
@ -21,9 +21,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
private ToolStripMenuItem cmdRestart;
|
private ToolStripMenuItem cmdRestart;
|
||||||
private ToolStripSeparator toolStripSeparator1;
|
private ToolStripSeparator toolStripSeparator1;
|
||||||
private ToolStripMenuItem cmdCommunity;
|
private ToolStripMenuItem cmdCommunity;
|
||||||
private ToolStripMenuItem cmdApiDocs;
|
|
||||||
private ToolStripMenuItem cmdSwagger;
|
|
||||||
private ToolStripMenuItem cmdGtihub;
|
|
||||||
|
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger _logger;
|
||||||
private readonly IServerApplicationHost _appHost;
|
private readonly IServerApplicationHost _appHost;
|
||||||
|
@ -43,8 +40,8 @@ namespace MediaBrowser.ServerApplication
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public ServerNotifyIcon(ILogManager logManager,
|
public ServerNotifyIcon(ILogManager logManager,
|
||||||
IServerApplicationHost appHost,
|
IServerApplicationHost appHost,
|
||||||
IServerConfigurationManager configurationManager,
|
IServerConfigurationManager configurationManager,
|
||||||
ILocalizationManager localization)
|
ILocalizationManager localization)
|
||||||
{
|
{
|
||||||
|
@ -52,13 +49,13 @@ namespace MediaBrowser.ServerApplication
|
||||||
_localization = localization;
|
_localization = localization;
|
||||||
_appHost = appHost;
|
_appHost = appHost;
|
||||||
_configurationManager = configurationManager;
|
_configurationManager = configurationManager;
|
||||||
|
|
||||||
var components = new System.ComponentModel.Container();
|
var components = new System.ComponentModel.Container();
|
||||||
|
|
||||||
var resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
var resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
|
||||||
contextMenuStrip1 = new ContextMenuStrip(components);
|
contextMenuStrip1 = new ContextMenuStrip(components);
|
||||||
notifyIcon1 = new NotifyIcon(components);
|
notifyIcon1 = new NotifyIcon(components);
|
||||||
|
|
||||||
cmdExit = new ToolStripMenuItem();
|
cmdExit = new ToolStripMenuItem();
|
||||||
cmdCommunity = new ToolStripMenuItem();
|
cmdCommunity = new ToolStripMenuItem();
|
||||||
toolStripSeparator1 = new ToolStripSeparator();
|
toolStripSeparator1 = new ToolStripSeparator();
|
||||||
|
@ -66,10 +63,7 @@ namespace MediaBrowser.ServerApplication
|
||||||
toolStripSeparator2 = new ToolStripSeparator();
|
toolStripSeparator2 = new ToolStripSeparator();
|
||||||
cmdConfigure = new ToolStripMenuItem();
|
cmdConfigure = new ToolStripMenuItem();
|
||||||
cmdBrowse = new ToolStripMenuItem();
|
cmdBrowse = new ToolStripMenuItem();
|
||||||
cmdApiDocs = new ToolStripMenuItem();
|
|
||||||
cmdSwagger = new ToolStripMenuItem();
|
|
||||||
cmdGtihub = new ToolStripMenuItem();
|
|
||||||
|
|
||||||
//
|
//
|
||||||
// notifyIcon1
|
// notifyIcon1
|
||||||
//
|
//
|
||||||
|
@ -86,7 +80,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
toolStripSeparator2,
|
toolStripSeparator2,
|
||||||
cmdRestart,
|
cmdRestart,
|
||||||
toolStripSeparator1,
|
toolStripSeparator1,
|
||||||
cmdApiDocs,
|
|
||||||
cmdCommunity,
|
cmdCommunity,
|
||||||
cmdExit});
|
cmdExit});
|
||||||
contextMenuStrip1.Name = "contextMenuStrip1";
|
contextMenuStrip1.Name = "contextMenuStrip1";
|
||||||
|
@ -128,24 +121,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
//
|
//
|
||||||
cmdBrowse.Name = "cmdBrowse";
|
cmdBrowse.Name = "cmdBrowse";
|
||||||
cmdBrowse.Size = new System.Drawing.Size(208, 22);
|
cmdBrowse.Size = new System.Drawing.Size(208, 22);
|
||||||
//
|
|
||||||
// cmdApiDocs
|
|
||||||
//
|
|
||||||
cmdApiDocs.DropDownItems.AddRange(new ToolStripItem[] {
|
|
||||||
cmdSwagger,
|
|
||||||
cmdGtihub});
|
|
||||||
cmdApiDocs.Name = "cmdApiDocs";
|
|
||||||
cmdApiDocs.Size = new System.Drawing.Size(208, 22);
|
|
||||||
//
|
|
||||||
// cmdSwagger
|
|
||||||
//
|
|
||||||
cmdSwagger.Name = "cmdSwagger";
|
|
||||||
cmdSwagger.Size = new System.Drawing.Size(136, 22);
|
|
||||||
//
|
|
||||||
// cmdGtihub
|
|
||||||
//
|
|
||||||
cmdGtihub.Name = "cmdGtihub";
|
|
||||||
cmdGtihub.Size = new System.Drawing.Size(136, 22);
|
|
||||||
|
|
||||||
cmdExit.Click += cmdExit_Click;
|
cmdExit.Click += cmdExit_Click;
|
||||||
cmdRestart.Click += cmdRestart_Click;
|
cmdRestart.Click += cmdRestart_Click;
|
||||||
|
@ -153,9 +128,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
cmdCommunity.Click += cmdCommunity_Click;
|
cmdCommunity.Click += cmdCommunity_Click;
|
||||||
cmdBrowse.Click += cmdBrowse_Click;
|
cmdBrowse.Click += cmdBrowse_Click;
|
||||||
|
|
||||||
cmdSwagger.Click += cmdSwagger_Click;
|
|
||||||
cmdGtihub.Click += cmdGtihub_Click;
|
|
||||||
|
|
||||||
_configurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
|
_configurationManager.ConfigurationUpdated += Instance_ConfigurationUpdated;
|
||||||
|
|
||||||
LocalizeText();
|
LocalizeText();
|
||||||
|
@ -194,9 +166,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
|
|
||||||
cmdExit.Text = _localization.GetLocalizedString("LabelExit");
|
cmdExit.Text = _localization.GetLocalizedString("LabelExit");
|
||||||
cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
|
cmdCommunity.Text = _localization.GetLocalizedString("LabelVisitCommunity");
|
||||||
cmdGtihub.Text = _localization.GetLocalizedString("LabelGithub");
|
|
||||||
cmdSwagger.Text = _localization.GetLocalizedString("LabelApiDocumentation");
|
|
||||||
cmdApiDocs.Text = _localization.GetLocalizedString("LabelDeveloperResources");
|
|
||||||
cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
|
cmdBrowse.Text = _localization.GetLocalizedString("LabelBrowseLibrary");
|
||||||
cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureServer");
|
cmdConfigure.Text = _localization.GetLocalizedString("LabelConfigureServer");
|
||||||
cmdRestart.Text = _localization.GetLocalizedString("LabelRestartServer");
|
cmdRestart.Text = _localization.GetLocalizedString("LabelRestartServer");
|
||||||
|
@ -242,16 +211,6 @@ namespace MediaBrowser.ServerApplication
|
||||||
_appHost.Shutdown();
|
_appHost.Shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
void cmdGtihub_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
BrowserLauncher.OpenGithub(_logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
void cmdSwagger_Click(object sender, EventArgs e)
|
|
||||||
{
|
|
||||||
BrowserLauncher.OpenSwagger(_appHost, _logger);
|
|
||||||
}
|
|
||||||
|
|
||||||
~ServerNotifyIcon()
|
~ServerNotifyIcon()
|
||||||
{
|
{
|
||||||
Dispose();
|
Dispose();
|
||||||
|
@ -265,4 +224,4 @@ namespace MediaBrowser.ServerApplication
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
//[assembly: AssemblyVersion("3.0.*")]
|
[assembly: AssemblyVersion("3.0.*")]
|
||||||
[assembly: AssemblyVersion("3.0.5724.6")]
|
//[assembly: AssemblyVersion("3.0.5724.6")]
|
||||||
|
|
Loading…
Reference in New Issue