Merge pull request #1448 from joshuaboniface/nice-userconfig-paths

Use the username for the user config path

1 files changed, 9 insertions, 1 deletions

diff --git a/MediaBrowser.Controller/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs
index 0d5f508dd..9952ba418 100644
--- a/MediaBrowser.Controller/Entities/User.cs
+++ b/MediaBrowser.Controller/Entities/User.cs
@@ -228,7 +228,15 @@ namespace MediaBrowser.Controller.Entities
                 return System.IO.Path.Combine(ConfigurationManager.ApplicationPaths.UserConfigurationDirectoryPath, safeFolderName);
             }
 
-            return System.IO.Path.Combine(parentPath, Id.ToString("N"));
+            // TODO: Remove idPath and just use usernamePath for future releases
+            var usernamePath = System.IO.Path.Combine(parentPath, username);
+            var idPath = System.IO.Path.Combine(parentPath, Id.ToString("N"));
+            if (!Directory.Exists(usernamePath) && Directory.Exists(idPath))
+            {
+                Directory.Move(idPath, usernamePath);
+            }
+
+            return usernamePath;
         }
 
         public bool IsParentalScheduleAllowed()