Rename MusicbrainzId references to ForeignId

(cherry picked from commit a840bb542362d58006b6cc27affd58ee6b965b80)

azure-pipelines.yml

@@ -9,7 +9,7 @@ variables:
   testsFolder: './_tests'
   yarnCacheFolder: $(Pipeline.Workspace)/.yarn
   nugetCacheFolder: $(Pipeline.Workspace)/.nuget/packages
-  majorVersion: '0.4.9'
+  majorVersion: '0.4.10'
   minorVersion: $[counter('minorVersion', 1)]
   readarrVersion: '$(majorVersion).$(minorVersion)'
   buildName: '$(Build.SourceBranchName).$(readarrVersion)'

frontend/src/Settings/ImportLists/ImportListExclusions/EditImportListExclusionModalContent.js

@@ -76,7 +76,7 @@ function EditImportListExclusionModalContent(props) {
 
               <FormGroup>
                 <FormLabel>
-                  {translate('MusicbrainzId')}
+                  {translate('ForeignId')}
                 </FormLabel>
 
                 <FormInputGroup

src/NzbDrone.Common/Disk/DiskTransferService.cs

@@ -342,10 +342,11 @@ namespace NzbDrone.Common.Disk
 
             var isCifs = targetDriveFormat == "cifs";
             var isBtrfs = sourceDriveFormat == "btrfs" && targetDriveFormat == "btrfs";
+            var isZfs = sourceDriveFormat == "zfs" && targetDriveFormat == "zfs";
 
             if (mode.HasFlag(TransferMode.Copy))
             {
-                if (isBtrfs)
+                if (isBtrfs || isZfs)
                 {
                     if (_diskProvider.TryCreateRefLink(sourcePath, targetPath))
                     {
@@ -359,7 +360,7 @@ namespace NzbDrone.Common.Disk
 
             if (mode.HasFlag(TransferMode.Move))
             {
-                if (isBtrfs)
+                if (isBtrfs || isZfs)
                 {
                     if (isSameMount && _diskProvider.TryRenameFile(sourcePath, targetPath))
                     {

src/NzbDrone.Core/Books/Services/AddAuthorService.cs

@@ -102,9 +102,9 @@ namespace NzbDrone.Core.Books
                 _logger.Error("ReadarrId {0} was not found, it may have been removed from Goodreads.", newAuthor.Metadata.Value.ForeignAuthorId);
 
                 throw new ValidationException(new List<ValidationFailure>
-                                              {
+                {
-                                                  new ValidationFailure("MusicbrainzId", "An author with this ID was not found", newAuthor.Metadata.Value.ForeignAuthorId)
+                    new ("ForeignAuthorId", "An author with this ID was not found", newAuthor.Metadata.Value.ForeignAuthorId)
-                                              });
+                });
             }
 
             author.ApplyChanges(newAuthor);

src/NzbDrone.Core/Exceptions/AuthorNotFoundException.cs

@@ -4,24 +4,24 @@ namespace NzbDrone.Core.Exceptions
 {
     public class AuthorNotFoundException : NzbDroneException
     {
-        public string MusicBrainzId { get; set; }
+        public string ForeignAuthorId { get; set; }
 
-        public AuthorNotFoundException(string musicbrainzId)
+        public AuthorNotFoundException(string foreignAuthorId)
-            : base(string.Format("Author with id {0} was not found, it may have been removed from the metadata server.", musicbrainzId))
+            : base($"Author with id {foreignAuthorId} was not found, it may have been removed from the metadata server.")
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignAuthorId = foreignAuthorId;
         }
 
-        public AuthorNotFoundException(string musicbrainzId, string message, params object[] args)
+        public AuthorNotFoundException(string foreignAuthorId, string message, params object[] args)
             : base(message, args)
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignAuthorId = foreignAuthorId;
         }
 
-        public AuthorNotFoundException(string musicbrainzId, string message)
+        public AuthorNotFoundException(string foreignAuthorId, string message)
             : base(message)
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignAuthorId = foreignAuthorId;
         }
     }
 }

src/NzbDrone.Core/Exceptions/BookNotFoundException.cs

@@ -4,24 +4,24 @@ namespace NzbDrone.Core.Exceptions
 {
     public class BookNotFoundException : NzbDroneException
     {
-        public string MusicBrainzId { get; set; }
+        public string ForeignBookId { get; set; }
 
-        public BookNotFoundException(string musicbrainzId)
+        public BookNotFoundException(string foreignBookId)
-            : base(string.Format("Book with id {0} was not found, it may have been removed from metadata server.", musicbrainzId))
+            : base($"Book with id {foreignBookId} was not found, it may have been removed from metadata server.")
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignBookId = foreignBookId;
         }
 
-        public BookNotFoundException(string musicbrainzId, string message, params object[] args)
+        public BookNotFoundException(string foreignBookId, string message, params object[] args)
             : base(message, args)
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignBookId = foreignBookId;
         }
 
-        public BookNotFoundException(string musicbrainzId, string message)
+        public BookNotFoundException(string foreignBookId, string message)
             : base(message)
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignBookId = foreignBookId;
         }
     }
 }

src/NzbDrone.Core/Exceptions/EditionNotFoundException.cs

@@ -4,24 +4,24 @@ namespace NzbDrone.Core.Exceptions
 {
     public class EditionNotFoundException : NzbDroneException
     {
-        public string MusicBrainzId { get; set; }
+        public string ForeignEditionId { get; set; }
 
-        public EditionNotFoundException(string musicbrainzId)
+        public EditionNotFoundException(string foreignEditionId)
-            : base(string.Format("Edition with id {0} was not found, it may have been removed from metadata server.", musicbrainzId))
+            : base($"Edition with id {foreignEditionId} was not found, it may have been removed from metadata server.")
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignEditionId = foreignEditionId;
         }
 
-        public EditionNotFoundException(string musicbrainzId, string message, params object[] args)
+        public EditionNotFoundException(string foreignEditionId, string message, params object[] args)
             : base(message, args)
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignEditionId = foreignEditionId;
         }
 
-        public EditionNotFoundException(string musicbrainzId, string message)
+        public EditionNotFoundException(string foreignEditionId, string message)
             : base(message)
         {
-            MusicBrainzId = musicbrainzId;
+            ForeignEditionId = foreignEditionId;
         }
     }
 }

src/NzbDrone.Core/Localization/Core/en.json

@@ -394,7 +394,7 @@
   "ForMoreInformationOnTheIndividualIndexersClickOnTheInfoButtons": "For more information on the individual indexers, click on the info buttons.",
   "ForMoreInformationOnTheIndividualListsClickOnTheInfoButtons": "For more information on the individual lists, click on the info buttons.",
   "ForeignId": "Foreign ID",
-  "ForeignIdHelpText": "The Musicbrainz Id of the author/book to exclude",
+  "ForeignIdHelpText": "The Foreign Id of the author/book to exclude",
   "Formats": "Formats",
   "FreeSpace": "Free Space",
   "FutureBooks": "Future Books",
@@ -619,7 +619,6 @@
   "MusicBrainzRecordingID": "MusicBrainz Recording ID",
   "MusicBrainzReleaseID": "MusicBrainz Release ID",
   "MusicBrainzTrackID": "MusicBrainz Track ID",
-  "MusicbrainzId": "Musicbrainz Id",
   "MustContain": "Must Contain",
   "MustNotContain": "Must Not Contain",
   "NETCore": ".NET Core",