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

bump dev version

Browse Source
This commit is contained in:
Luke Pulverenti 2015-05-28 01:51:48 -04:00
parent f4bd53d4db
commit 3241a11e99
6 changed files with 37 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Common.Implementations/BaseApplicationPaths.cs
View File

@ -24,7 +24,10 @@ namespace MediaBrowser.Common.Implementations
/// <summary>
/// Gets the path to the system folder
/// </summary>
public string ProgramSystemPath { get { return Path.Combine(ProgramDataPath, "system"); } }
public string ProgramSystemPath
{
get { return Path.GetDirectoryName(ApplicationPath); }
}
/// <summary>
/// The _data directory

5
MediaBrowser.Server.Implementations/Localization/JavaScript/javascript.json
View File

@ -783,8 +783,9 @@
"MessageUnlockAppWithSupporter": "Unlock the full features of the app by signing in with an active Emby Supporter Membership.",
"MessageToValidateSupporter": "To validate your Emby Supporter Membership, simply sign into the app using your Wifi connection within your home network.",
"MessagePaymentServicesUnavailable": "Payment services are currently unavailable. Please try again later.",
"ButtonUnlockWithSupporter": "Unlock with Emby Supporter Membership",
"ButtonUnlockWithSupporter": "Sign in with Emby Supporter Membership",
"MessagePleaseSignInLocalNetwork": "Before proceeding, please ensure that you're connected to your local network using a Wifi or LAN connection.",
"ButtonUnlockWithPurchase": "Unlock with Purchase",
"MessageLiveTvGuideRequiresUnlock": "The Live TV Guide is currently limited to {0} channels. Click the unlock button to learn how to enjoy the full experience."
"MessageLiveTvGuideRequiresUnlock": "The Live TV Guide is currently limited to {0} channels. Click the unlock button to learn how to enjoy the full experience.",
"OptionEnableFullscreen": "Enable Fullscreen"
}

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
}

6
MediaBrowser.WebDashboard/Api/PackageCreator.cs
View File

@ -553,6 +553,7 @@ namespace MediaBrowser.WebDashboard.Api
"syncjob.js",
"appservices.js",
"playlistmanager.js",
"appsettings.js",
"mediaplayer.js",
"mediaplayer-video.js",
@ -602,10 +603,6 @@ namespace MediaBrowser.WebDashboard.Api
"metadatanfo.js",
"moviecollections.js",
"mypreferencesdisplay.js",
"mypreferenceslanguages.js",
"mypreferenceswebclient.js",
"notifications.js",
"notificationlist.js",
"notificationsetting.js",
@ -623,7 +620,6 @@ namespace MediaBrowser.WebDashboard.Api
"syncsettings.js",
"thememediaplayer.js",
"useredit.js",
"myprofile.js",
"userpassword.js",
"userprofilespage.js",
"userparentalcontrol.js",

6
MediaBrowser.WebDashboard/MediaBrowser.WebDashboard.csproj
View File

@ -138,6 +138,9 @@
<Content Include="dashboard-ui\photos.html">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\appsettings.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\dashboardhosting.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@ -156,6 +159,9 @@
<Content Include="dashboard-ui\scripts\livetvitems.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\mypreferencescommon.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="dashboard-ui\scripts\photos.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>

4
SharedVersion.cs
View File

@ -1,4 +1,4 @@
using System.Reflection;
//[assembly: AssemblyVersion("3.0.*")]
[assembly: AssemblyVersion("3.0.5621.4")]
[assembly: AssemblyVersion("3.0.*")]
//[assembly: AssemblyVersion("3.0.5621.4")]