Update to 3.5.2 and .net core 2.1

1 files changed, 48 insertions, 40 deletions

diff --git a/Emby.Server.Implementations/ServerApplicationPaths.cs b/Emby.Server.Implementations/ServerApplicationPaths.cs
index 3e3f7e0d7..1686a548b 100644
--- a/Emby.Server.Implementations/ServerApplicationPaths.cs
+++ b/Emby.Server.Implementations/ServerApplicationPaths.cs
@@ -58,26 +58,6 @@ namespace Emby.Server.Implementations
         }
 
         /// <summary>
-        /// The _ibn path
-        /// </summary>
-        private string _ibnPath;
-        /// <summary>
-        /// Gets the path to the Images By Name directory
-        /// </summary>
-        /// <value>The images by name path.</value>
-        public string ItemsByNamePath
-        {
-            get
-            {
-                return _ibnPath ?? (_ibnPath = Path.Combine(ProgramDataPath, "ImagesByName"));
-            }
-            set
-            {
-                _ibnPath = value;
-            }
-        }
-
-        /// <summary>
         /// Gets the path to the People directory
         /// </summary>
         /// <value>The people path.</value>
@@ -85,7 +65,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "People");
+                return Path.Combine(InternalMetadataPath, "People");
             }
         }
 
@@ -93,7 +73,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "artists");
+                return Path.Combine(InternalMetadataPath, "artists");
             }
         }
 
@@ -105,7 +85,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "Genre");
+                return Path.Combine(InternalMetadataPath, "Genre");
             }
         }
 
@@ -117,7 +97,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "MusicGenre");
+                return Path.Combine(InternalMetadataPath, "MusicGenre");
             }
         }
 
@@ -129,7 +109,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "Studio");
+                return Path.Combine(InternalMetadataPath, "Studio");
             }
         }
 
@@ -141,7 +121,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "Year");
+                return Path.Combine(InternalMetadataPath, "Year");
             }
         }
 
@@ -153,7 +133,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "general");
+                return Path.Combine(InternalMetadataPath, "general");
             }
         }
 
@@ -165,7 +145,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "ratings");
+                return Path.Combine(InternalMetadataPath, "ratings");
             }
         }
 
@@ -177,7 +157,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "mediainfo");
+                return Path.Combine(InternalMetadataPath, "mediainfo");
             }
         }
 
@@ -193,12 +173,21 @@ namespace Emby.Server.Implementations
             }
         }
 
+        private string _defaultTranscodingTempPath;
+        public string DefaultTranscodingTempPath
+        {
+            get
+            {
+                return _defaultTranscodingTempPath ?? (_defaultTranscodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp"));
+            }
+        }
+
         private string _transcodingTempPath;
         public string TranscodingTempPath
         {
             get
             {
-                return _transcodingTempPath ?? (_transcodingTempPath = Path.Combine(ProgramDataPath, "transcoding-temp"));
+                return _transcodingTempPath ?? (_transcodingTempPath = DefaultTranscodingTempPath);
             }
             set
             {
@@ -210,17 +199,26 @@ namespace Emby.Server.Implementations
         {
             var path = TranscodingTempPath;
 
-            try
-            {
-                Directory.CreateDirectory(path);
-                return path;
-            }
-            catch
+            if (!string.Equals(path, DefaultTranscodingTempPath, StringComparison.OrdinalIgnoreCase))
             {
-                path = Path.Combine(ProgramDataPath, "transcoding-temp");
-                Directory.CreateDirectory(path);
-                return path;
+                try
+                {
+                    Directory.CreateDirectory(path);
+
+                    var testPath = Path.Combine(path, Guid.NewGuid().ToString());
+                    Directory.CreateDirectory(testPath);
+                    Directory.Delete(testPath);
+
+                    return path;
+                }
+                catch
+                {
+                }
             }
+
+            path = DefaultTranscodingTempPath;
+            Directory.CreateDirectory(path);
+            return path;
         }
 
         /// <summary>
@@ -231,7 +229,7 @@ namespace Emby.Server.Implementations
         {
             get
             {
-                return Path.Combine(ItemsByNamePath, "GameGenre");
+                return Path.Combine(InternalMetadataPath, "GameGenre");
             }
         }
 
@@ -247,5 +245,15 @@ namespace Emby.Server.Implementations
                 _internalMetadataPath = value;
             }
         }
+
+        private const string _virtualInternalMetadataPath = "%MetadataPath%";
+        public string VirtualInternalMetadataPath
+        {
+            get
+            {
+                return _virtualInternalMetadataPath;
+            }
+        }
+
     }
 }