pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

update use of shellexecute

This commit is contained in:
Luke Pulverenti 2016-12-09 20:58:52 -05:00
parent c7d520555b
commit e936f49518
13 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/Data/BaseSqliteRepository.cs
View File

@ -70,7 +70,7 @@ namespace Emby.Server.Implementations.Data
connectionFlags = ConnectionFlags.Create;
connectionFlags |= ConnectionFlags.ReadWrite;
connectionFlags |= ConnectionFlags.SharedCached;
connectionFlags |= ConnectionFlags.NoMutex;
//connectionFlags |= ConnectionFlags.NoMutex;
var db = SQLite3.Open(DbFilePath, connectionFlags, null);

2
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -318,7 +318,7 @@
<Private>True</Private>
</Reference>
<Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
<HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\portable-net45+netcore45+wpa81+MonoAndroid10+MonoTouch10+Xamarin.iOS10\SQLitePCLRaw.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="UniversalDetector, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">

2
Emby.Server.Implementations/LiveTv/EmbyTV/EmbyTV.cs
View File

@ -1573,7 +1573,7 @@ namespace Emby.Server.Implementations.LiveTv.EmbyTV
ErrorDialog = false,
FileName = options.RecordingPostProcessor,
IsHidden = true,
UseShellExecute = true
UseShellExecute = false
});
_logger.Info("Running recording post processor {0} {1}", process.StartInfo.FileName, process.StartInfo.Arguments);

2
Emby.Server.Implementations/LiveTv/Listings/SchedulesDirect.cs
View File

@ -213,7 +213,7 @@ namespace Emby.Server.Implementations.LiveTv.Listings
{
ScheduleDirect.Station station;
if (channelPair.TryGetValue(channelNumber, out station))
if (!string.IsNullOrWhiteSpace(channelNumber) && channelPair.TryGetValue(channelNumber, out station))
{
return station;
}

4
Emby.Server.Implementations/LiveTv/TunerHosts/M3UTunerHost.cs
View File

@ -149,8 +149,8 @@ namespace Emby.Server.Implementations.LiveTv.TunerHosts
}
},
RequiresOpening = false,
RequiresClosing = false,
RequiresOpening = true,
RequiresClosing = true,
ReadAtNativeFramerate = false,

2
Emby.Server.Implementations/packages.config
View File

@ -3,6 +3,6 @@
<package id="Emby.XmlTv" version="1.0.2" targetFramework="portable45-net45+win8" />
<package id="MediaBrowser.Naming" version="1.0.3" targetFramework="portable45-net45+win8" />
<package id="SQLitePCL.pretty" version="1.1.0" targetFramework="portable45-net45+win8" />
<package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="portable45-net45+win8" />
<package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="portable45-net45+win8" />
<package id="UniversalDetector" version="1.0.1" targetFramework="portable45-net45+win8" />
</packages>

4
MediaBrowser.MediaEncoding/Encoder/MediaEncoder.cs
View File

@ -989,7 +989,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
var process = _processFactory.Create(new ProcessOptions
{
CreateNoWindow = true,
UseShellExecute = true,
UseShellExecute = false,
FileName = FFMpegPath,
Arguments = args,
IsHidden = true,
@ -1092,7 +1092,7 @@ namespace MediaBrowser.MediaEncoding.Encoder
var process = _processFactory.Create(new ProcessOptions
{
CreateNoWindow = true,
UseShellExecute = true,
UseShellExecute = false,
FileName = FFMpegPath,
Arguments = args,
IsHidden = true,

4
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -451,7 +451,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
var process = _processFactory.Create(new ProcessOptions
{
CreateNoWindow = true,
UseShellExecute = true,
UseShellExecute = false,
FileName = _mediaEncoder.EncoderPath,
Arguments = string.Format("{0} -i \"{1}\" -c:s srt \"{2}\"", encodingParam, inputPath, outputPath),
@ -582,7 +582,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
var process = _processFactory.Create(new ProcessOptions
{
CreateNoWindow = true,
UseShellExecute = true,
UseShellExecute = false,
FileName = _mediaEncoder.EncoderPath,
Arguments = processArgs,

4
MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj
View File

@ -85,11 +85,11 @@
<Private>True</Private>
</Reference>
<Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath>
<HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
<HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

2
MediaBrowser.Server.Mono/Program.cs
View File

@ -55,7 +55,7 @@ namespace MediaBrowser.Server.Mono
var logger = _logger = logManager.GetLogger("Main");
ApplicationHost.LogEnvironmentInfo(logger, appPaths, true);
AppDomain.CurrentDomain.UnhandledException += CurrentDomain_UnhandledException;
try

4
MediaBrowser.Server.Mono/packages.config
View File

@ -5,6 +5,6 @@
<package id="ServiceStack.Text" version="4.5.4" targetFramework="net46" />
<package id="SharpCompress" version="0.14.0" targetFramework="net46" />
<package id="SimpleInjector" version="3.2.4" targetFramework="net46" />
<package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net46" />
<package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net46" />
<package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="net46" />
<package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1" targetFramework="net46" />
</packages>

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

@ -91,11 +91,11 @@
<Private>True</Private>
</Reference>
<Reference Include="SQLitePCLRaw.core, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1488e028ca7ab535, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.core.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.core.dll</HintPath>
<HintPath>..\packages\SQLitePCLRaw.core.1.1.1\lib\net45\SQLitePCLRaw.core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="SQLitePCLRaw.provider.sqlite3, Version=1.0.0.0, Culture=neutral, PublicKeyToken=62684c7b4f184e3f, processorArchitecture=MSIL">
<HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1-pre20161109081005\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
<HintPath>..\packages\SQLitePCLRaw.provider.sqlite3.net45.1.1.1\lib\net45\SQLitePCLRaw.provider.sqlite3.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

4
MediaBrowser.ServerApplication/packages.config
View File

@ -5,6 +5,6 @@
<package id="ServiceStack.Text" version="4.5.4" targetFramework="net462" />
<package id="SharpCompress" version="0.14.0" targetFramework="net462" />
<package id="SimpleInjector" version="3.2.4" targetFramework="net462" />
<package id="SQLitePCLRaw.core" version="1.1.1-pre20161109081005" targetFramework="net462" />
<package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1-pre20161109081005" targetFramework="net462" />
<package id="SQLitePCLRaw.core" version="1.1.1" targetFramework="net462" />
<package id="SQLitePCLRaw.provider.sqlite3.net45" version="1.1.1" targetFramework="net462" />
</packages>