starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-13 12:33:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into culture

Browse Source
This commit is contained in:
Bond-009
2019-01-30 16:57:15 +01:00
committed by GitHub
parent a709cbdc64 ffcf6bdd3a
commit 1ea219bf3f
121 changed files with 536 additions and 887 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Emby.IsoMounting/IsoMounter/LinuxIsoManager.cs
View File

@@ -39,7 +39,7 @@ namespace IsoMounter
_logger = logger;
ProcessFactory = processFactory;
MountPointRoot = FileSystem.DirectorySeparatorChar + "tmp" + FileSystem.DirectorySeparatorChar + "Emby";
MountPointRoot = Path.DirectorySeparatorChar + "tmp" + Path.DirectorySeparatorChar + "Emby";
_logger.LogDebug(
"[{0}] System PATH is currently set to [{1}].",
@@ -214,9 +214,9 @@ namespace IsoMounter
{
string path = test.Trim();
if (!string.IsNullOrEmpty(path) && FileSystem.FileExists(path = Path.Combine(path, name)))
if (!string.IsNullOrEmpty(path) && File.Exists(path = Path.Combine(path, name)))
{
return FileSystem.GetFullPath(path);
return Path.GetFullPath(path);
}
}
@@ -326,7 +326,7 @@ namespace IsoMounter
try
{
FileSystem.CreateDirectory(mountPoint);
Directory.CreateDirectory(mountPoint);
}
catch (UnauthorizedAccessException)
{
@@ -376,7 +376,7 @@ namespace IsoMounter
try
{
FileSystem.DeleteDirectory(mountPoint, false);
Directory.Delete(mountPoint, false);
}
catch (Exception ex)
{
@@ -454,7 +454,7 @@ namespace IsoMounter
try
{
FileSystem.DeleteDirectory(mount.MountedPath, false);
Directory.Delete(mount.MountedPath, false);
}
catch (Exception ex)
{