Merge pull request #8 from jellyfin/master

rebase to latest master

1 files changed, 8 insertions, 9 deletions

diff --git a/Emby.Server.Implementations/Library/ResolverHelper.cs b/Emby.Server.Implementations/Library/ResolverHelper.cs
index 14b28966a..96d1bff92 100644
--- a/Emby.Server.Implementations/Library/ResolverHelper.cs
+++ b/Emby.Server.Implementations/Library/ResolverHelper.cs
@@ -1,10 +1,9 @@
-using MediaBrowser.Controller.Entities;
-using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Providers;
 using System;
 using System.IO;
 using System.Linq;
-using System.Text.RegularExpressions;
+using MediaBrowser.Controller.Entities;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.IO;
 
 namespace Emby.Server.Implementations.Library
@@ -22,7 +21,7 @@ namespace Emby.Server.Implementations.Library
         /// <param name="fileSystem">The file system.</param>
         /// <param name="libraryManager">The library manager.</param>
         /// <param name="directoryService">The directory service.</param>
-        /// <exception cref="System.ArgumentException">Item must have a path</exception>
+        /// <exception cref="ArgumentException">Item must have a path</exception>
         public static void SetInitialItemValues(BaseItem item, Folder parent, IFileSystem fileSystem, ILibraryManager libraryManager, IDirectoryService directoryService)
         {
             // This version of the below method has no ItemResolveArgs, so we have to require the path already being set
@@ -104,7 +103,7 @@ namespace Emby.Server.Implementations.Library
         /// <returns>System.String.</returns>
         private static string GetDisplayName(string path, bool isDirectory)
         {
-           return isDirectory ? Path.GetFileName(path) : Path.GetFileNameWithoutExtension(path);
+            return isDirectory ? Path.GetFileName(path) : Path.GetFileNameWithoutExtension(path);
         }
 
         /// <summary>
@@ -117,15 +116,15 @@ namespace Emby.Server.Implementations.Library
         {
             if (fileSystem == null)
             {
-                throw new ArgumentNullException("fileSystem");
+                throw new ArgumentNullException(nameof(fileSystem));
             }
             if (item == null)
             {
-                throw new ArgumentNullException("item");
+                throw new ArgumentNullException(nameof(item));
             }
             if (args == null)
             {
-                throw new ArgumentNullException("args");
+                throw new ArgumentNullException(nameof(args));
             }
 
             // See if a different path came out of the resolver than what went in