alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-20 09:04:42 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #1118 from MediaBrowser/dev

Browse Source 
3.0.5641.4
This commit is contained in:
Luke
2015-06-15 00:28:29 -04:00
parent 5aafbe3dd6 55eb54cbc2
commit 7d9d57a36e
232 changed files with 11842 additions and 10182 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
MediaBrowser.ServerApplication/Icon.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 26 KiB

104
MediaBrowser.ServerApplication/MainForm.Designer.cs generated
View File

@@ -32,19 +32,19 @@
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
this.notifyIcon1 = new System.Windows.Forms.NotifyIcon(this.components);
this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components);
this.cmdExit = new System.Windows.Forms.ToolStripMenuItem();
this.cmdCommunity = new System.Windows.Forms.ToolStripMenuItem();
this.cmdLogWindow = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.cmdRestart = new System.Windows.Forms.ToolStripMenuItem();
this.cmdLibraryExplorer = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cmdConfigure = new System.Windows.Forms.ToolStripMenuItem();
this.cmdBrowse = new System.Windows.Forms.ToolStripMenuItem();
this.cmdConfigure = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.cmdLibraryExplorer = new System.Windows.Forms.ToolStripMenuItem();
this.cmdRestart = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.cmdApiDocs = new System.Windows.Forms.ToolStripMenuItem();
this.cmdStandardDocs = new System.Windows.Forms.ToolStripMenuItem();
this.cmdSwagger = new System.Windows.Forms.ToolStripMenuItem();
this.cmdGtihub = new System.Windows.Forms.ToolStripMenuItem();
this.cmdLogWindow = new System.Windows.Forms.ToolStripMenuItem();
this.cmdCommunity = new System.Windows.Forms.ToolStripMenuItem();
this.cmdExit = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuStrip1.SuspendLayout();
this.SuspendLayout();
//
@@ -71,48 +71,13 @@
this.contextMenuStrip1.Name = "contextMenuStrip1";
this.contextMenuStrip1.ShowCheckMargin = true;
this.contextMenuStrip1.ShowImageMargin = false;
this.contextMenuStrip1.Size = new System.Drawing.Size(209, 214);
this.contextMenuStrip1.Size = new System.Drawing.Size(209, 192);
//
// cmdExit
// cmdBrowse
//
this.cmdExit.Name = "cmdExit";
this.cmdExit.Size = new System.Drawing.Size(208, 22);
this.cmdExit.Text = "Exit";
//
// cmdCommunity
//
this.cmdCommunity.Name = "cmdCommunity";
this.cmdCommunity.Size = new System.Drawing.Size(208, 22);
this.cmdCommunity.Text = "Visit Community";
//
// cmdLogWindow
//
this.cmdLogWindow.CheckOnClick = true;
this.cmdLogWindow.Name = "cmdLogWindow";
this.cmdLogWindow.Size = new System.Drawing.Size(208, 22);
this.cmdLogWindow.Text = "Show Log Window";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(205, 6);
//
// cmdRestart
//
this.cmdRestart.Name = "cmdRestart";
this.cmdRestart.Size = new System.Drawing.Size(208, 22);
this.cmdRestart.Text = "Restart Server";
//
// cmdLibraryExplorer
//
this.cmdLibraryExplorer.Name = "cmdLibraryExplorer";
this.cmdLibraryExplorer.Size = new System.Drawing.Size(208, 22);
this.cmdLibraryExplorer.Text = "Open Library Explorer";
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(205, 6);
this.cmdBrowse.Name = "cmdBrowse";
this.cmdBrowse.Size = new System.Drawing.Size(208, 22);
this.cmdBrowse.Text = "Browse Library";
//
// cmdConfigure
//
@@ -120,11 +85,27 @@
this.cmdConfigure.Size = new System.Drawing.Size(208, 22);
this.cmdConfigure.Text = "Configure Media Browser";
//
// cmdBrowse
// toolStripSeparator2
//
this.cmdBrowse.Name = "cmdBrowse";
this.cmdBrowse.Size = new System.Drawing.Size(208, 22);
this.cmdBrowse.Text = "Browse Library";
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(205, 6);
//
// cmdLibraryExplorer
//
this.cmdLibraryExplorer.Name = "cmdLibraryExplorer";
this.cmdLibraryExplorer.Size = new System.Drawing.Size(208, 22);
this.cmdLibraryExplorer.Text = "Open Library Explorer";
//
// cmdRestart
//
this.cmdRestart.Name = "cmdRestart";
this.cmdRestart.Size = new System.Drawing.Size(208, 22);
this.cmdRestart.Text = "Restart Server";
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(205, 6);
//
// cmdApiDocs
//
@@ -154,6 +135,25 @@
this.cmdGtihub.Size = new System.Drawing.Size(136, 22);
this.cmdGtihub.Text = "Github Wiki";
//
// cmdLogWindow
//
this.cmdLogWindow.CheckOnClick = true;
this.cmdLogWindow.Name = "cmdLogWindow";
this.cmdLogWindow.Size = new System.Drawing.Size(208, 22);
this.cmdLogWindow.Text = "Show Log Window";
//
// cmdCommunity
//
this.cmdCommunity.Name = "cmdCommunity";
this.cmdCommunity.Size = new System.Drawing.Size(208, 22);
this.cmdCommunity.Text = "Visit Community";
//
// cmdExit
//
this.cmdExit.Name = "cmdExit";
this.cmdExit.Size = new System.Drawing.Size(208, 22);
this.cmdExit.Text = "Exit";
//
// MainForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

5103
MediaBrowser.ServerApplication/MainForm.resx
View File

File diff suppressed because it is too large Load Diff

4
MediaBrowser.ServerApplication/MediaBrowser.ServerApplication.csproj
View File

@@ -37,7 +37,7 @@
<StartupObject>MediaBrowser.ServerApplication.MainStartup</StartupObject>
</PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Images\Icon.ico</ApplicationIcon>
<ApplicationIcon>Icon.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
@@ -237,6 +237,7 @@
<Content Include="CORE_RL_zlib_.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Icon.ico" />
<Content Include="IM_MOD_RL_bgr_.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -399,7 +400,6 @@
<Content Include="IM_MOD_RL_yuv_.dll">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\Images\Icon.ico" />
<Content Include="Resources\Images\mb3logo800.png" />
</ItemGroup>
<ItemGroup>

2
MediaBrowser.ServerApplication/Native/WindowsApp.cs
View File

@@ -90,7 +90,7 @@ namespace MediaBrowser.ServerApplication.Native
MainStartup.Shutdown();
}
public void Restart()
public void Restart(StartupOptions startupOptions)
{
MainStartup.Restart();
}

BIN
MediaBrowser.ServerApplication/Resources/Images/Icon.ico
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 138 KiB

2
MediaBrowser.ServerApplication/ServerNotifyIcon.cs
View File

@@ -74,7 +74,7 @@ namespace MediaBrowser.ServerApplication
// notifyIcon1
//
notifyIcon1.ContextMenuStrip = contextMenuStrip1;
notifyIcon1.Icon = ((System.Drawing.Icon)(resources.GetObject("notifyIcon1.Icon")));
notifyIcon1.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
notifyIcon1.Text = "Emby";
notifyIcon1.Visible = true;
//

2
MediaBrowser.ServerApplication/Splash/SplashForm.Designer.cs generated
View File

@@ -108,7 +108,7 @@
this.lblVersion.Location = new System.Drawing.Point(3, 59);
this.lblVersion.MaximumSize = new System.Drawing.Size(0, 100);
this.lblVersion.Name = "lblVersion";
this.lblVersion.Size = new System.Drawing.Size(270, 59);
this.lblVersion.Size = new System.Drawing.Size(267, 59);
this.lblVersion.TabIndex = 1;
this.lblVersion.Text = "Version 1234";
this.lblVersion.UseWaitCursor = true;

3277
MediaBrowser.ServerApplication/Splash/SplashForm.resx
View File

File diff suppressed because it is too large Load Diff

BIN
MediaBrowser.ServerApplication/SplashLogo2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.4 KiB

31
MediaBrowser.ServerApplication/Updates/ApplicationUpdater.cs
View File

@@ -21,27 +21,38 @@ namespace MediaBrowser.ServerApplication.Updates
version = File.ReadAllText(archive + ".ver");
}
var systemPath = appPaths.ProgramSystemPath;
var tempPath = Path.GetTempPath();
// Use our installer passing it the specific archive
// We need to copy to a temp directory and execute it there
var source = Path.Combine(appPaths.ProgramSystemPath, UpdaterExe);
var source = Path.Combine(systemPath, UpdaterExe);
logger.Info("Copying updater to temporary location");
var tempUpdater = Path.Combine(Path.GetTempPath(), UpdaterExe);
var tempUpdater = Path.Combine(tempPath, UpdaterExe);
File.Copy(source, tempUpdater, true);
source = Path.Combine(appPaths.ProgramSystemPath, UpdaterDll);
var tempUpdaterDll = Path.Combine(Path.GetTempPath(), UpdaterDll);
source = Path.Combine(systemPath, UpdaterDll);
var tempUpdaterDll = Path.Combine(tempPath, UpdaterDll);
logger.Info("Copying updater dependencies to temporary location");
File.Copy(source, tempUpdaterDll, true);
const string product = "server";
var product = "server";
// Our updater needs SS and ionic
source = Path.Combine(appPaths.ProgramSystemPath, "ServiceStack.Text.dll");
File.Copy(source, Path.Combine(Path.GetTempPath(), "ServiceStack.Text.dll"), true);
source = Path.Combine(appPaths.ProgramSystemPath, "SharpCompress.dll");
File.Copy(source, Path.Combine(Path.GetTempPath(), "SharpCompress.dll"), true);
source = Path.Combine(systemPath, "ServiceStack.Text.dll");
File.Copy(source, Path.Combine(tempPath, "ServiceStack.Text.dll"), true);
source = Path.Combine(systemPath, "SharpCompress.dll");
File.Copy(source, Path.Combine(tempPath, "SharpCompress.dll"), true);
logger.Info("Starting updater process.");
Process.Start(tempUpdater, string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath=\"{5}\"", product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath));
// installpath = program data folder
// startpath = executable to launch
// systempath = folder containing installation
var args = string.Format("product={0} archive=\"{1}\" caller={2} pismo=false version={3} service={4} installpath=\"{5}\" startpath=\"{6}\" systempath=\"{7}\"",
product, archive, Process.GetCurrentProcess().Id, version, restartServiceName ?? string.Empty, appPaths.ProgramDataPath, appPaths.ApplicationPath, systemPath);
logger.Info("Args: {0}", args);
Process.Start(tempUpdater, args);
// That's it. The installer will do the work once we exit
}