fix: don't assume directory name is not nullable

since it can be null.
ShokoAnime · Oct 10, 2024 · 36043df · 36043df
1 parent 88e0a0f
commit 36043df
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Shoko.Server/Renamer/RenameFileService.cs b/Shoko.Server/Renamer/RenameFileService.cs
@@ -237,8 +237,8 @@ private static RelocationResult UnAbstractResult(SVR_VideoLocal_Place place, Abs
 
         var newImportFolder = shouldMove && !result.SkipMove ? result.DestinationImportFolder! : place.ImportFolder!;
         var newFileName = shouldRename && !result.SkipRename ? result.FileName! : place.FileName;
-        var newRelativeDirectory = shouldMove && !result.SkipMove ? result.Path! : Path.GetDirectoryName(place.FilePath)!;
-        var newRelativePath = newRelativeDirectory.Length > 0 ? Path.Combine(newRelativeDirectory, newFileName) : newFileName;
+        var newRelativeDirectory = shouldMove && !result.SkipMove ? result.Path : Path.GetDirectoryName(place.FilePath);
+        var newRelativePath = !string.IsNullOrEmpty(newRelativeDirectory) && newRelativeDirectory.Length > 0 ? Path.Combine(newRelativeDirectory, newFileName) : newFileName;
         var newFullPath = Path.Combine(newImportFolder.Path, newRelativePath);
         return new()
         {