From 59f8e3046e800db1699955c4b0bb801ec0d2c831 Mon Sep 17 00:00:00 2001 From: "kay.one" Date: Thu, 25 Jul 2013 23:48:35 -0700 Subject: [PATCH] app data is now stored in /var/[USER]/.config/ folder in *nix --- .../EnvironmentInfo/AppFolderInfo.cs | 29 ++++++------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs b/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs index d7100fa71..156d257c1 100644 --- a/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs +++ b/NzbDrone.Common/EnvironmentInfo/AppFolderInfo.cs @@ -17,37 +17,26 @@ namespace NzbDrone.Common.EnvironmentInfo { private readonly IDiskProvider _diskProvider; private readonly Logger _logger; + private readonly Environment.SpecialFolder _dataSpecialFolder = Environment.SpecialFolder.CommonApplicationData; + public AppFolderInfo(IDiskProvider diskProvider) { _diskProvider = diskProvider; _logger = LogManager.GetCurrentClassLogger(); - AppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData, Environment.SpecialFolderOption.DoNotVerify), "NzbDrone"); + + if (OsInfo.IsLinux) + { + _dataSpecialFolder = Environment.SpecialFolder.ApplicationData; + } + + AppDataFolder = Path.Combine(Environment.GetFolderPath(_dataSpecialFolder, Environment.SpecialFolderOption.DoNotVerify), "NzbDrone"); StartUpFolder = new FileInfo(Assembly.GetExecutingAssembly().Location).Directory.FullName; TempFolder = Path.GetTempPath(); - if (!_diskProvider.FolderExists(AppDataFolder)) - { - MigrateFromAppData(); - } - SetPermissions(); } - private void MigrateFromAppData() - { - var oldAppDataFolder = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData, Environment.SpecialFolderOption.DoNotVerify), "NzbDrone"); - - if (_diskProvider.FolderExists(oldAppDataFolder)) - { - _diskProvider.MoveFolder(oldAppDataFolder, AppDataFolder); - } - else - { - _diskProvider.CreateFolder(AppDataFolder); - } - } - private void SetPermissions() { try