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

Merge pull request #1766 from MediaBrowser/dev

Browse Source 
Dev
This commit is contained in:
Luke 2016-05-23 13:58:03 -04:00
commit a9a52eb0fb
4 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MediaBrowser.Api/StartupWizardService.cs
View File

@ -109,6 +109,7 @@ namespace MediaBrowser.Api
private void SetWizardFinishValues(ServerConfiguration config)
{
config.EnableLocalizedGuids = true;
config.EnableCustomPathSubFolders = true;
config.EnableStandaloneMusicKeys = true;
config.EnableCaseSensitiveItemIds = true;

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

@ -199,6 +199,7 @@ namespace MediaBrowser.Model.Configuration
public bool EnableAnonymousUsageReporting { get; set; }
public bool EnableStandaloneMusicKeys { get; set; }
public bool EnableLocalizedGuids { get; set; }
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
@ -208,6 +209,7 @@ namespace MediaBrowser.Model.Configuration
Migrations = new string[] { };
EnableCustomPathSubFolders = true;
EnableLocalizedGuids = true;
ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096;

2
MediaBrowser.Server.Implementations/Library/LibraryManager.cs
View File

@ -502,7 +502,7 @@ namespace MediaBrowser.Server.Implementations.Library
throw new ArgumentNullException("type");
}
if (key.StartsWith(ConfigurationManager.ApplicationPaths.ProgramDataPath))
if (ConfigurationManager.Configuration.EnableLocalizedGuids && key.StartsWith(ConfigurationManager.ApplicationPaths.ProgramDataPath))
{
// Try to normalize paths located underneath program-data in an attempt to make them more portable
key = key.Substring(ConfigurationManager.ApplicationPaths.ProgramDataPath.Length)

13
MediaBrowser.ServerApplication/Native/SqliteExtensions.cs
View File

@ -54,9 +54,18 @@ namespace MediaBrowser.ServerApplication.Native
_logger = logger;
}
public Task<IDbConnection> Connect(string dbPath)
public async Task<IDbConnection> Connect(string dbPath)
{
return SqliteExtensions.ConnectToDb(dbPath, _logger);
try
{
return await SqliteExtensions.ConnectToDb(dbPath, _logger).ConfigureAwait(false);
}
catch (Exception ex)
{
_logger.ErrorException("Error opening database {0}", ex, dbPath);
throw;
}
}
}
}