From c333ca41618f52843e634cb389954f7018cc671d Mon Sep 17 00:00:00 2001 From: Qstick Date: Mon, 30 Oct 2017 22:03:47 -0400 Subject: [PATCH] Change Backup Names To Not Conflict with Sonarr --- src/Lidarr.Http/Frontend/Mappers/BackupFileMapper.cs | 4 ++-- src/NzbDrone.Core/Backup/BackupService.cs | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Lidarr.Http/Frontend/Mappers/BackupFileMapper.cs b/src/Lidarr.Http/Frontend/Mappers/BackupFileMapper.cs index bc79a53fb..771c5944e 100644 --- a/src/Lidarr.Http/Frontend/Mappers/BackupFileMapper.cs +++ b/src/Lidarr.Http/Frontend/Mappers/BackupFileMapper.cs @@ -25,7 +25,7 @@ namespace Lidarr.Http.Frontend.Mappers public override bool CanHandle(string resourceUrl) { - return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("nzbdrone_backup_") && resourceUrl.EndsWith(".zip"); + return resourceUrl.StartsWith("/backup/") && resourceUrl.ContainsIgnoreCase("lidarr_backup_") && resourceUrl.EndsWith(".zip"); } } -} \ No newline at end of file +} diff --git a/src/NzbDrone.Core/Backup/BackupService.cs b/src/NzbDrone.Core/Backup/BackupService.cs index 8728e7dc1..8d5238c2c 100644 --- a/src/NzbDrone.Core/Backup/BackupService.cs +++ b/src/NzbDrone.Core/Backup/BackupService.cs @@ -35,7 +35,7 @@ namespace NzbDrone.Core.Backup private string _backupTempFolder; - private static readonly Regex BackupFileRegex = new Regex(@"nzbdrone_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex BackupFileRegex = new Regex(@"lidarr_backup_[._0-9]+\.zip", RegexOptions.Compiled | RegexOptions.IgnoreCase); public BackupService(IMainDatabase maindDb, IMakeDatabaseBackup makeDatabaseBackup, @@ -53,7 +53,7 @@ namespace NzbDrone.Core.Backup _archiveService = archiveService; _logger = logger; - _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "nzbdrone_backup"); + _backupTempFolder = Path.Combine(_appFolderInfo.TempFolder, "lidarr_backup"); } public void Backup(BackupType backupType) @@ -63,7 +63,7 @@ namespace NzbDrone.Core.Backup _diskProvider.EnsureFolder(_backupTempFolder); _diskProvider.EnsureFolder(GetBackupFolder(backupType)); - var backupFilename = string.Format("nzbdrone_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now); + var backupFilename = string.Format("lidarr_backup_{0:yyyy.MM.dd_HH.mm.ss}.zip", DateTime.Now); var backupPath = Path.Combine(GetBackupFolder(backupType), backupFilename); Cleanup();