store local library folder hierarchy in db (#1616)

CHANGELOG.md

@@ -36,6 +36,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 - Fix playback of media items with no audio streams
 - Fix timestamp continuity in `HLS Segmenter` sessions
   - This should make *some* clients happier 
+- Fix `Other Video`, `Song` and `Image` fallback metadata tags to always include parent folder (folder added to library) 
 
 ### Changed
 - Log search index updates under scanner category at debug level, to indicate a potential cause for the UI being out of date

ErsatzTV.Core.Tests/Fakes/FakeTelevisionRepository.cs

@@ -47,7 +47,11 @@ public class FakeTelevisionRepository : ITelevisionRepository
     public Task<Either<BaseError, Season>> GetOrAddSeason(Show show, int libraryPathId, int seasonNumber) =>
         throw new NotSupportedException();
 
-    public Task<Either<BaseError, Episode>> GetOrAddEpisode(Season season, LibraryPath libraryPath, string path) =>
+    public Task<Either<BaseError, Episode>> GetOrAddEpisode(
+        Season season,
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path) =>
         throw new NotSupportedException();
 
     public Task<IEnumerable<string>> FindEpisodePaths(LibraryPath libraryPath) => throw new NotSupportedException();

ErsatzTV.Core/Domain/Library/LibraryFolder.cs

@@ -6,5 +6,9 @@ public class LibraryFolder
     public string Path { get; set; }
     public int LibraryPathId { get; set; }
     public LibraryPath LibraryPath { get; set; }
+    public int? ParentId { get; set; }
+    public LibraryFolder Parent { get; set; }
+    public ICollection<LibraryFolder> Children { get; set; }
+    public ICollection<MediaFile> MediaFiles { get; set; }
     public string Etag { get; set; }
 }

ErsatzTV.Core/Domain/MediaItem/MediaFile.cs

@@ -7,4 +7,7 @@ public class MediaFile
 
     public int MediaVersionId { get; set; }
     public MediaVersion MediaVersion { get; set; }
+    
+    public int? LibraryFolderId { get; set; }
+    public LibraryFolder LibraryFolder { get; set; }
 }

ErsatzTV.Core/Interfaces/Repositories/IImageRepository.cs

@@ -5,7 +5,10 @@ namespace ErsatzTV.Core.Interfaces.Repositories;
 
 public interface IImageRepository
 {
-    Task<Either<BaseError, MediaItemScanResult<Image>>> GetOrAdd(LibraryPath libraryPath, string path);
+    Task<Either<BaseError, MediaItemScanResult<Image>>> GetOrAdd(
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path);
     Task<IEnumerable<string>> FindImagePaths(LibraryPath libraryPath);
     Task<List<int>> DeleteByPath(LibraryPath libraryPath, string path);
     Task<bool> AddTag(ImageMetadata metadata, Tag tag);

ErsatzTV.Core/Interfaces/Repositories/ILibraryRepository.cs

@@ -12,6 +12,10 @@ public interface ILibraryRepository
     Task<Unit> UpdateLastScan(LibraryPath libraryPath);
     Task<List<LibraryPath>> GetLocalPaths(int libraryId);
     Task<int> CountMediaItemsByPath(int libraryPathId);
-    Task<Unit> SetEtag(LibraryPath libraryPath, Option<LibraryFolder> knownFolder, string path, string etag);
+    Task SetEtag(LibraryPath libraryPath, Option<LibraryFolder> knownFolder, string path, string etag);
-    Task<Unit> CleanEtagsForLibraryPath(LibraryPath libraryPath);
+    Task CleanEtagsForLibraryPath(LibraryPath libraryPath);
+    Task<Option<int>> GetParentFolderId(string folder);
+    Task<LibraryFolder> GetOrAddFolder(LibraryPath libraryPath, Option<int> maybeParentFolder, string folder);
+    Task UpdateLibraryFolderId(MediaFile mediaFile, int libraryFolderId);
+    Task UpdatePath(LibraryPath libraryPath, string normalizedLibraryPath);
 }

ErsatzTV.Core/Interfaces/Repositories/IMovieRepository.cs

@@ -7,7 +7,12 @@ public interface IMovieRepository
 {
     Task<bool> AllMoviesExist(List<int> movieIds);
     Task<Option<Movie>> GetMovie(int movieId);
-    Task<Either<BaseError, MediaItemScanResult<Movie>>> GetOrAdd(LibraryPath libraryPath, string path);
+
+    Task<Either<BaseError, MediaItemScanResult<Movie>>> GetOrAdd(
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path);
+
     Task<List<MovieMetadata>> GetMoviesForCards(List<int> ids);
     Task<IEnumerable<string>> FindMoviePaths(LibraryPath libraryPath);
     Task<List<int>> DeleteByPath(LibraryPath libraryPath, string path);

ErsatzTV.Core/Interfaces/Repositories/IMusicVideoRepository.cs

@@ -8,6 +8,7 @@ public interface IMusicVideoRepository
     Task<Either<BaseError, MediaItemScanResult<MusicVideo>>> GetOrAdd(
         Artist artist,
         LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
         string path);
 
     Task<IEnumerable<string>> FindMusicVideoPaths(LibraryPath libraryPath);

ErsatzTV.Core/Interfaces/Repositories/IOtherVideoRepository.cs

@@ -5,7 +5,10 @@ namespace ErsatzTV.Core.Interfaces.Repositories;
 
 public interface IOtherVideoRepository
 {
-    Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> GetOrAdd(LibraryPath libraryPath, string path);
+    Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> GetOrAdd(
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path);
     Task<IEnumerable<string>> FindOtherVideoPaths(LibraryPath libraryPath);
     Task<List<int>> DeleteByPath(LibraryPath libraryPath, string path);
     Task<bool> AddGenre(OtherVideoMetadata metadata, Genre genre);

ErsatzTV.Core/Interfaces/Repositories/ISongRepository.cs

@@ -5,7 +5,10 @@ namespace ErsatzTV.Core.Interfaces.Repositories;
 
 public interface ISongRepository
 {
-    Task<Either<BaseError, MediaItemScanResult<Song>>> GetOrAdd(LibraryPath libraryPath, string path);
+    Task<Either<BaseError, MediaItemScanResult<Song>>> GetOrAdd(
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path);
     Task<IEnumerable<string>> FindSongPaths(LibraryPath libraryPath);
     Task<List<int>> DeleteByPath(LibraryPath libraryPath, string path);
     Task<bool> AddGenre(SongMetadata metadata, Genre genre);

ErsatzTV.Core/Interfaces/Repositories/ITelevisionRepository.cs

@@ -24,7 +24,13 @@ public interface ITelevisionRepository
     Task<Option<Show>> GetShowByMetadata(int libraryPathId, ShowMetadata metadata, string showFolder);
     Task<Either<BaseError, MediaItemScanResult<Show>>> AddShow(int libraryPathId, ShowMetadata metadata);
     Task<Either<BaseError, Season>> GetOrAddSeason(Show show, int libraryPathId, int seasonNumber);
-    Task<Either<BaseError, Episode>> GetOrAddEpisode(Season season, LibraryPath libraryPath, string path);
+
+    Task<Either<BaseError, Episode>> GetOrAddEpisode(
+        Season season,
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path);
+
     Task<IEnumerable<string>> FindEpisodePaths(LibraryPath libraryPath);
     Task<Unit> DeleteByPath(LibraryPath libraryPath, string path);
     Task<Unit> DeleteEmptySeasons(LibraryPath libraryPath);

ErsatzTV.Infrastructure.MySql/Migrations/20240216120724_Rework_LibraryFolder.cs

@@ -0,0 +1,80 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.MySql.Migrations
+{
+    /// <inheritdoc />
+    public partial class Rework_LibraryFolder : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "LibraryFolderId",
+                table: "MediaFile",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ParentId",
+                table: "LibraryFolder",
+                type: "int",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MediaFile_LibraryFolderId",
+                table: "MediaFile",
+                column: "LibraryFolderId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LibraryFolder_ParentId",
+                table: "LibraryFolder",
+                column: "ParentId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_LibraryFolder_LibraryFolder_ParentId",
+                table: "LibraryFolder",
+                column: "ParentId",
+                principalTable: "LibraryFolder",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MediaFile_LibraryFolder_LibraryFolderId",
+                table: "MediaFile",
+                column: "LibraryFolderId",
+                principalTable: "LibraryFolder",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_LibraryFolder_LibraryFolder_ParentId",
+                table: "LibraryFolder");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_MediaFile_LibraryFolder_LibraryFolderId",
+                table: "MediaFile");
+
+            migrationBuilder.DropIndex(
+                name: "IX_MediaFile_LibraryFolderId",
+                table: "MediaFile");
+
+            migrationBuilder.DropIndex(
+                name: "IX_LibraryFolder_ParentId",
+                table: "LibraryFolder");
+
+            migrationBuilder.DropColumn(
+                name: "LibraryFolderId",
+                table: "MediaFile");
+
+            migrationBuilder.DropColumn(
+                name: "ParentId",
+                table: "LibraryFolder");
+        }
+    }
+}

ErsatzTV.Infrastructure.MySql/Migrations/20240216120800_Reset_LocalLibraryFolders.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.MySql.Migrations
+{
+    /// <inheritdoc />
+    public partial class Reset_LocalLibraryFolders : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // reset local library folders, and require scans
+
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM Library L INNER JOIN LibraryPath LP ON L.Id = LP.LibraryId INNER JOIN LocalMediaSource LMS ON LMS.Id = L.MediaSourceId)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaSourceId IN (SELECT Id FROM LocalMediaSource)");
+
+            migrationBuilder.Sql(
+                @"DELETE FROM LibraryFolder WHERE LibraryPathId IN (SELECT LP.Id FROM Library L INNER JOIN LibraryPath LP ON L.Id = LP.LibraryId INNER JOIN LocalMediaSource LMS ON LMS.Id = L.MediaSourceId)");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

ErsatzTV.Infrastructure.MySql/Migrations/TvContextModelSnapshot.cs

@@ -904,6 +904,9 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
                     b.Property<int>("LibraryPathId")
                         .HasColumnType("int");
 
+                    b.Property<int?>("ParentId")
+                        .HasColumnType("int");
+
                     b.Property<string>("Path")
                         .HasColumnType("longtext");
 
@@ -911,6 +914,8 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
 
                     b.HasIndex("LibraryPathId");
 
+                    b.HasIndex("ParentId");
+
                     b.ToTable("LibraryFolder", (string)null);
                 });
 
@@ -970,6 +975,9 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("int");
 
+                    b.Property<int?>("LibraryFolderId")
+                        .HasColumnType("int");
+
                     b.Property<int>("MediaVersionId")
                         .HasColumnType("int");
 
@@ -978,6 +986,8 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("LibraryFolderId");
+
                     b.HasIndex("MediaVersionId");
 
                     b.HasIndex("Path")
@@ -3470,7 +3480,14 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ErsatzTV.Core.Domain.LibraryFolder", "Parent")
+                        .WithMany("Children")
+                        .HasForeignKey("ParentId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.Navigation("LibraryPath");
+
+                    b.Navigation("Parent");
                 });
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.LibraryPath", b =>
@@ -3497,12 +3514,19 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.MediaFile", b =>
                 {
+                    b.HasOne("ErsatzTV.Core.Domain.LibraryFolder", "LibraryFolder")
+                        .WithMany("MediaFiles")
+                        .HasForeignKey("LibraryFolderId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("ErsatzTV.Core.Domain.MediaVersion", "MediaVersion")
                         .WithMany("MediaFiles")
                         .HasForeignKey("MediaVersionId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("LibraryFolder");
+
                     b.Navigation("MediaVersion");
                 });
 
@@ -4789,6 +4813,13 @@ namespace ErsatzTV.Infrastructure.MySql.Migrations
                     b.Navigation("Paths");
                 });
 
+            modelBuilder.Entity("ErsatzTV.Core.Domain.LibraryFolder", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("MediaFiles");
+                });
+
             modelBuilder.Entity("ErsatzTV.Core.Domain.LibraryPath", b =>
                 {
                     b.Navigation("LibraryFolders");

ErsatzTV.Infrastructure.Sqlite/Migrations/20240216022703_Rework_LibraryFolder.cs

@@ -0,0 +1,80 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Sqlite.Migrations
+{
+    /// <inheritdoc />
+    public partial class Rework_LibraryFolder : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "LibraryFolderId",
+                table: "MediaFile",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.AddColumn<int>(
+                name: "ParentId",
+                table: "LibraryFolder",
+                type: "INTEGER",
+                nullable: true);
+
+            migrationBuilder.CreateIndex(
+                name: "IX_MediaFile_LibraryFolderId",
+                table: "MediaFile",
+                column: "LibraryFolderId");
+
+            migrationBuilder.CreateIndex(
+                name: "IX_LibraryFolder_ParentId",
+                table: "LibraryFolder",
+                column: "ParentId");
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_LibraryFolder_LibraryFolder_ParentId",
+                table: "LibraryFolder",
+                column: "ParentId",
+                principalTable: "LibraryFolder",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+
+            migrationBuilder.AddForeignKey(
+                name: "FK_MediaFile_LibraryFolder_LibraryFolderId",
+                table: "MediaFile",
+                column: "LibraryFolderId",
+                principalTable: "LibraryFolder",
+                principalColumn: "Id",
+                onDelete: ReferentialAction.Restrict);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropForeignKey(
+                name: "FK_LibraryFolder_LibraryFolder_ParentId",
+                table: "LibraryFolder");
+
+            migrationBuilder.DropForeignKey(
+                name: "FK_MediaFile_LibraryFolder_LibraryFolderId",
+                table: "MediaFile");
+
+            migrationBuilder.DropIndex(
+                name: "IX_MediaFile_LibraryFolderId",
+                table: "MediaFile");
+
+            migrationBuilder.DropIndex(
+                name: "IX_LibraryFolder_ParentId",
+                table: "LibraryFolder");
+
+            migrationBuilder.DropColumn(
+                name: "LibraryFolderId",
+                table: "MediaFile");
+
+            migrationBuilder.DropColumn(
+                name: "ParentId",
+                table: "LibraryFolder");
+        }
+    }
+}

ErsatzTV.Infrastructure.Sqlite/Migrations/20240216022831_Reset_LocalLibraryFolders.cs

@@ -0,0 +1,31 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace ErsatzTV.Infrastructure.Sqlite.Migrations
+{
+    /// <inheritdoc />
+    public partial class Reset_LocalLibraryFolders : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            // reset local library folders, and require scans
+
+            migrationBuilder.Sql(
+                @"UPDATE LibraryPath SET LastScan = '0001-01-01 00:00:00' WHERE Id IN
+                (SELECT LP.Id FROM Library L INNER JOIN LibraryPath LP ON L.Id = LP.LibraryId INNER JOIN LocalMediaSource LMS ON LMS.Id = L.MediaSourceId)");
+
+            migrationBuilder.Sql(
+                @"UPDATE Library SET LastScan = '0001-01-01 00:00:00' WHERE MediaSourceId IN (SELECT Id FROM LocalMediaSource)");
+
+            migrationBuilder.Sql(
+                @"DELETE FROM LibraryFolder WHERE LibraryPathId IN (SELECT LP.Id FROM Library L INNER JOIN LibraryPath LP ON L.Id = LP.LibraryId INNER JOIN LocalMediaSource LMS ON LMS.Id = L.MediaSourceId)");
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+        }
+    }
+}

ErsatzTV.Infrastructure.Sqlite/Migrations/TvContextModelSnapshot.cs

@@ -902,6 +902,9 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
                     b.Property<int>("LibraryPathId")
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("ParentId")
+                        .HasColumnType("INTEGER");
+
                     b.Property<string>("Path")
                         .HasColumnType("TEXT");
 
@@ -909,6 +912,8 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
 
                     b.HasIndex("LibraryPathId");
 
+                    b.HasIndex("ParentId");
+
                     b.ToTable("LibraryFolder", (string)null);
                 });
 
@@ -968,6 +973,9 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("INTEGER");
 
+                    b.Property<int?>("LibraryFolderId")
+                        .HasColumnType("INTEGER");
+
                     b.Property<int>("MediaVersionId")
                         .HasColumnType("INTEGER");
 
@@ -976,6 +984,8 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
 
                     b.HasKey("Id");
 
+                    b.HasIndex("LibraryFolderId");
+
                     b.HasIndex("MediaVersionId");
 
                     b.HasIndex("Path")
@@ -3468,7 +3478,14 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.HasOne("ErsatzTV.Core.Domain.LibraryFolder", "Parent")
+                        .WithMany("Children")
+                        .HasForeignKey("ParentId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.Navigation("LibraryPath");
+
+                    b.Navigation("Parent");
                 });
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.LibraryPath", b =>
@@ -3495,12 +3512,19 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
 
             modelBuilder.Entity("ErsatzTV.Core.Domain.MediaFile", b =>
                 {
+                    b.HasOne("ErsatzTV.Core.Domain.LibraryFolder", "LibraryFolder")
+                        .WithMany("MediaFiles")
+                        .HasForeignKey("LibraryFolderId")
+                        .OnDelete(DeleteBehavior.Restrict);
+
                     b.HasOne("ErsatzTV.Core.Domain.MediaVersion", "MediaVersion")
                         .WithMany("MediaFiles")
                         .HasForeignKey("MediaVersionId")
                         .OnDelete(DeleteBehavior.Cascade)
                         .IsRequired();
 
+                    b.Navigation("LibraryFolder");
+
                     b.Navigation("MediaVersion");
                 });
 
@@ -4787,6 +4811,13 @@ namespace ErsatzTV.Infrastructure.Sqlite.Migrations
                     b.Navigation("Paths");
                 });
 
+            modelBuilder.Entity("ErsatzTV.Core.Domain.LibraryFolder", b =>
+                {
+                    b.Navigation("Children");
+
+                    b.Navigation("MediaFiles");
+                });
+
             modelBuilder.Entity("ErsatzTV.Core.Domain.LibraryPath", b =>
                 {
                     b.Navigation("LibraryFolders");

ErsatzTV.Infrastructure/Data/Configurations/Library/LibraryFolderConfiguration.cs

@@ -6,5 +6,14 @@ namespace ErsatzTV.Infrastructure.Data.Configurations;
 
 public class LibraryFolderConfiguration : IEntityTypeConfiguration<LibraryFolder>
 {
-    public void Configure(EntityTypeBuilder<LibraryFolder> builder) => builder.ToTable("LibraryFolder");
+    public void Configure(EntityTypeBuilder<LibraryFolder> builder)
+    {
+        builder.ToTable("LibraryFolder");
+
+        builder.HasOne(f => f.Parent)
+            .WithMany(p => p.Children)
+            .HasForeignKey(f => f.ParentId)
+            .IsRequired(false)
+            .OnDelete(DeleteBehavior.Restrict);
+    }
 }

ErsatzTV.Infrastructure/Data/Configurations/MediaItem/MediaFileConfiguration.cs

@@ -12,5 +12,11 @@ public class MediaFileConfiguration : IEntityTypeConfiguration<MediaFile>
 
         builder.HasIndex(f => f.Path)
             .IsUnique();
+
+        builder.HasOne(f => f.LibraryFolder)
+            .WithMany(f => f.MediaFiles)
+            .HasForeignKey(f => f.LibraryFolderId)
+            .IsRequired(false)
+            .OnDelete(DeleteBehavior.Restrict);
     }
 }

ErsatzTV.Infrastructure/Data/Repositories/ImageRepository.cs

@@ -22,6 +22,7 @@ public class ImageRepository : IImageRepository
 
     public async Task<Either<BaseError, MediaItemScanResult<Image>>> GetOrAdd(
         LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
         string path)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
@@ -55,7 +56,7 @@ public class ImageRepository : IImageRepository
             mediaItem =>
                 Right<BaseError, MediaItemScanResult<Image>>(
                     new MediaItemScanResult<Image>(mediaItem) { IsAdded = false }).AsTask(),
-            async () => await AddImage(dbContext, libraryPath.Id, path));
+            async () => await AddImage(dbContext, libraryPath.Id, libraryFolder.Id, path));
     }
 
     public async Task<IEnumerable<string>> FindImagePaths(LibraryPath libraryPath)
@@ -124,6 +125,7 @@ public class ImageRepository : IImageRepository
     private async Task<Either<BaseError, MediaItemScanResult<Image>>> AddImage(
         TvContext dbContext,
         int libraryPathId,
+        int libraryFolderId,
         string path)
     {
         try
@@ -133,14 +135,14 @@ public class ImageRepository : IImageRepository
                 return new MediaFileAlreadyExists();
             }
 
-            var otherVideo = new Image
+            var image = new Image
             {
                 LibraryPathId = libraryPathId,
                 MediaVersions =
                 [
                     new MediaVersion
                     {
-                        MediaFiles = [new MediaFile { Path = path }],
+                        MediaFiles = [new MediaFile { Path = path, LibraryFolderId = libraryFolderId }],
                         Streams = []
                     }
                 ],
@@ -150,11 +152,11 @@ public class ImageRepository : IImageRepository
                 }
             };
 
-            await dbContext.Images.AddAsync(otherVideo);
+            await dbContext.Images.AddAsync(image);
             await dbContext.SaveChangesAsync();
-            await dbContext.Entry(otherVideo).Reference(m => m.LibraryPath).LoadAsync();
+            await dbContext.Entry(image).Reference(m => m.LibraryPath).LoadAsync();
-            await dbContext.Entry(otherVideo.LibraryPath).Reference(lp => lp.Library).LoadAsync();
+            await dbContext.Entry(image.LibraryPath).Reference(lp => lp.Library).LoadAsync();
-            return new MediaItemScanResult<Image>(otherVideo) { IsAdded = true };
+            return new MediaItemScanResult<Image>(image) { IsAdded = true };
         }
         catch (Exception ex)
         {

ErsatzTV.Infrastructure/Data/Repositories/LibraryRepository.cs

@@ -2,6 +2,7 @@
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Interfaces.Metadata;
 using ErsatzTV.Core.Interfaces.Repositories;
+using ErsatzTV.Infrastructure.Extensions;
 using Microsoft.EntityFrameworkCore;
 
 namespace ErsatzTV.Infrastructure.Data.Repositories;
@@ -90,22 +91,23 @@ public class LibraryRepository : ILibraryRepository
             new { LibraryPathId = libraryPathId });
     }
 
-    public async Task<Unit> SetEtag(
+    public async Task SetEtag(
         LibraryPath libraryPath,
         Option<LibraryFolder> knownFolder,
         string path,
-        string etag) =>
+        string etag)
-        await knownFolder.Match(
-            async folder =>
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
+
+        foreach (LibraryFolder folder in knownFolder)
+        {
             await dbContext.Connection.ExecuteAsync(
                 "UPDATE LibraryFolder SET Etag = @Etag WHERE Id = @Id",
                 new { folder.Id, Etag = etag });
-            },
+        }
-            async () =>
+
+        if (knownFolder.IsNone)
         {
-                await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
             await dbContext.LibraryFolders.AddAsync(
                 new LibraryFolder
                 {
@@ -113,26 +115,112 @@ public class LibraryRepository : ILibraryRepository
                     Etag = etag,
                     LibraryPathId = libraryPath.Id
                 });
+
             await dbContext.SaveChangesAsync();
-            }).ToUnit();
+        }
+    }
+
+    public async Task CleanEtagsForLibraryPath(LibraryPath libraryPath)
+    {
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
+
+        IOrderedEnumerable<LibraryFolder> orderedFolders = libraryPath.LibraryFolders
+            .Where(f => !_localFileSystem.FolderExists(f.Path))
+            .OrderByDescending(lp => lp.Path.Length);
+        
+        foreach (LibraryFolder folder in orderedFolders)
+        {
+            await dbContext.Connection.ExecuteAsync(
+                """
+                DELETE FROM LibraryFolder WHERE Id = @LibraryFolderId
+                AND NOT EXISTS (SELECT Id FROM MediaFile WHERE LibraryFolderId = @LibraryFolderId)
+                AND NOT EXISTS (SELECT Id FROM LibraryFolder WHERE ParentId = @LibraryFolderId)
+                """,
+                new { LibraryFolderId = folder.Id });
+        }
+    }
+
+    public async Task<Option<int>> GetParentFolderId(string folder)
+    {
+        DirectoryInfo parent = new DirectoryInfo(folder).Parent;
+        if (parent is null)
+        {
+            return Option<int>.None;
+        }
+
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
+
+        return await dbContext.LibraryFolders
+            .AsNoTracking()
+            .SelectOneAsync(lf => lf.Path, lf => lf.Path == parent.FullName)
+            .MapT(lf => lf.Id);
+    }
 
-    public async Task<Unit> CleanEtagsForLibraryPath(LibraryPath libraryPath)
+    public async Task<LibraryFolder> GetOrAddFolder(LibraryPath libraryPath, Option<int> maybeParentFolder, string folder)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
 
-        IEnumerable<string> folders = await dbContext.Connection.QueryAsync<string>(
+        // load from db or create new folder
-            @"SELECT LF.Path
+        LibraryFolder knownFolder = await libraryPath.LibraryFolders
-                FROM LibraryFolder LF
+            .Filter(f => f.Path == folder)
-                WHERE LF.LibraryPathId = @LibraryPathId",
+            .HeadOrNone()
-            new { LibraryPathId = libraryPath.Id });
+            .IfNoneAsync(CreateNewFolder(libraryPath, maybeParentFolder, folder));
 
-        foreach (string folder in folders.Where(f => !_localFileSystem.FolderExists(f)))
+        // update parent folder if not present
+        foreach (int parentFolder in maybeParentFolder)
+        {
+            if (knownFolder.ParentId != parentFolder)
             {
+                knownFolder.ParentId = parentFolder;
+
                 await dbContext.Connection.ExecuteAsync(
-                @"DELETE FROM LibraryFolder WHERE LibraryPathId = @LibraryPathId AND Path = @Path",
+                    "UPDATE LibraryFolder SET ParentId = @ParentId WHERE Id = @Id",
-                new { LibraryPathId = libraryPath.Id, Path = folder });
+                    new { ParentId = parentFolder, knownFolder.Id });
+            }
         }
 
-        return Unit.Default;
+        // add new folder to library path
+        if (knownFolder.Id < 1)
+        {
+            await dbContext.LibraryFolders.AddAsync(knownFolder);
+            await dbContext.SaveChangesAsync();
+        }
+
+        return knownFolder;
+    }
+
+    public async Task UpdateLibraryFolderId(MediaFile mediaFile, int libraryFolderId)
+    {
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
+        mediaFile.LibraryFolderId = libraryFolderId;
+        await dbContext.Connection.ExecuteAsync(
+            "UPDATE MediaFile SET LibraryFolderId = @LibraryFolderId WHERE Id = @Id",
+            new { LibraryFolderId = libraryFolderId, mediaFile.Id });
+    }
+
+    public async Task UpdatePath(LibraryPath libraryPath, string normalizedLibraryPath)
+    {
+        await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
+        libraryPath.Path = normalizedLibraryPath;
+        await dbContext.Connection.ExecuteAsync(
+            "UPDATE LibraryPath SET Path = @Path WHERE Id = @Id",
+            new { Path = normalizedLibraryPath, libraryPath.Id });
+    }
+
+    private static LibraryFolder CreateNewFolder(LibraryPath libraryPath, Option<int> maybeParentFolder, string folder)
+    {
+        int? parentId = null;
+        foreach (int parentFolder in maybeParentFolder)
+        {
+            parentId = parentFolder;
+        }
+        
+        return new LibraryFolder
+        {
+            Path = folder,
+            Etag = null,
+            LibraryPathId = libraryPath.Id,
+            ParentId = parentId
+        };
     }
 }

ErsatzTV.Infrastructure/Data/Repositories/MovieRepository.cs

@@ -57,7 +57,10 @@ public class MovieRepository : IMovieRepository
             .Map(Optional);
     }
 
-    public async Task<Either<BaseError, MediaItemScanResult<Movie>>> GetOrAdd(LibraryPath libraryPath, string path)
+    public async Task<Either<BaseError, MediaItemScanResult<Movie>>> GetOrAdd(
+        LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
+        string path)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
         Option<Movie> maybeExisting = await dbContext.Movies
@@ -96,7 +99,7 @@ public class MovieRepository : IMovieRepository
             mediaItem =>
                 Right<BaseError, MediaItemScanResult<Movie>>(
                     new MediaItemScanResult<Movie>(mediaItem) { IsAdded = false }).AsTask(),
-            async () => await AddMovie(dbContext, libraryPath.Id, path));
+            async () => await AddMovie(dbContext, libraryPath.Id, libraryFolder.Id, path));
     }
 
     public async Task<List<MovieMetadata>> GetMoviesForCards(List<int> ids)
@@ -232,6 +235,7 @@ public class MovieRepository : IMovieRepository
     private async Task<Either<BaseError, MediaItemScanResult<Movie>>> AddMovie(
         TvContext dbContext,
         int libraryPathId,
+        int libraryFolderId,
         string path)
     {
         try
@@ -244,18 +248,15 @@ public class MovieRepository : IMovieRepository
             var movie = new Movie
             {
                 LibraryPathId = libraryPathId,
-                MediaVersions = new List<MediaVersion>
+                MediaVersions =
-                {
+                [
-                    new()
+                    new MediaVersion
-                    {
-                        MediaFiles = new List<MediaFile>
                     {
-                            new() { Path = path }
+                        MediaFiles = [new MediaFile { Path = path, LibraryFolderId = libraryFolderId }],
-                        },
+                        Streams = []
-                        Streams = new List<MediaStream>()
                     }
-                },
+                ],
-                TraktListItems = new List<TraktListItem>()
+                TraktListItems = []
             };
             await dbContext.Movies.AddAsync(movie);
             await dbContext.SaveChangesAsync();

ErsatzTV.Infrastructure/Data/Repositories/MusicVideoRepository.cs

@@ -16,6 +16,7 @@ public class MusicVideoRepository : IMusicVideoRepository
     public async Task<Either<BaseError, MediaItemScanResult<MusicVideo>>> GetOrAdd(
         Artist artist,
         LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
         string path)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
@@ -62,7 +63,7 @@ public class MusicVideoRepository : IMusicVideoRepository
                 return Right<BaseError, MediaItemScanResult<MusicVideo>>(
                     new MediaItemScanResult<MusicVideo>(mediaItem) { IsAdded = false });
             },
-            async () => await AddMusicVideo(dbContext, artist, libraryPath.Id, path));
+            async () => await AddMusicVideo(dbContext, artist, libraryPath.Id, libraryFolder.Id, path));
     }
 
     public async Task<IEnumerable<string>> FindMusicVideoPaths(LibraryPath libraryPath)
@@ -219,6 +220,7 @@ public class MusicVideoRepository : IMusicVideoRepository
         TvContext dbContext,
         Artist artist,
         int libraryPathId,
+        int libraryFolderId,
         string path)
     {
         try
@@ -227,18 +229,18 @@ public class MusicVideoRepository : IMusicVideoRepository
             {
                 ArtistId = artist.Id,
                 LibraryPathId = libraryPathId,
-                MediaVersions = new List<MediaVersion>
+                MediaVersions =
+                [
+                    new MediaVersion
                     {
-                    new()
+                        MediaFiles = [new MediaFile { Path = path, LibraryFolderId = libraryFolderId }],
-                    {
+                        Streams = []
-                        MediaFiles = new List<MediaFile>
+                    }
+                ],
+                TraktListItems = new List<TraktListItem>
                 {
-                            new() { Path = path }
+                    Capacity = 0
-                        },
-                        Streams = new List<MediaStream>()
                 }
-                },
-                TraktListItems = new List<TraktListItem>()
             };
 
             await dbContext.MusicVideos.AddAsync(musicVideo);

ErsatzTV.Infrastructure/Data/Repositories/OtherVideoRepository.cs

@@ -22,6 +22,7 @@ public class OtherVideoRepository : IOtherVideoRepository
 
     public async Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> GetOrAdd(
         LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
         string path)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
@@ -59,7 +60,7 @@ public class OtherVideoRepository : IOtherVideoRepository
             mediaItem =>
                 Right<BaseError, MediaItemScanResult<OtherVideo>>(
                     new MediaItemScanResult<OtherVideo>(mediaItem) { IsAdded = false }).AsTask(),
-            async () => await AddOtherVideo(dbContext, libraryPath.Id, path));
+            async () => await AddOtherVideo(dbContext, libraryPath.Id, libraryFolder.Id, path));
     }
 
     public async Task<IEnumerable<string>> FindOtherVideoPaths(LibraryPath libraryPath)
@@ -189,6 +190,7 @@ public class OtherVideoRepository : IOtherVideoRepository
     private async Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> AddOtherVideo(
         TvContext dbContext,
         int libraryPathId,
+        int libraryFolderId,
         string path)
     {
         try
@@ -201,18 +203,15 @@ public class OtherVideoRepository : IOtherVideoRepository
             var otherVideo = new OtherVideo
             {
                 LibraryPathId = libraryPathId,
-                MediaVersions = new List<MediaVersion>
+                MediaVersions =
+                [
+                    new MediaVersion
                     {
-                    new()
+                        MediaFiles = [new MediaFile { Path = path, LibraryFolderId = libraryFolderId }],
-                    {
+                        Streams = []
-                        MediaFiles = new List<MediaFile>
-                        {
-                            new() { Path = path }
-                        },
-                        Streams = new List<MediaStream>()
                     }
-                },
+                ],
-                TraktListItems = new List<TraktListItem>()
+                TraktListItems = []
             };
 
             await dbContext.OtherVideos.AddAsync(otherVideo);

ErsatzTV.Infrastructure/Data/Repositories/SongRepository.cs

@@ -15,6 +15,7 @@ public class SongRepository : ISongRepository
 
     public async Task<Either<BaseError, MediaItemScanResult<Song>>> GetOrAdd(
         LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
         string path)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
@@ -44,7 +45,7 @@ public class SongRepository : ISongRepository
             mediaItem =>
                 Right<BaseError, MediaItemScanResult<Song>>(
                     new MediaItemScanResult<Song>(mediaItem) { IsAdded = false }).AsTask(),
-            async () => await AddSong(dbContext, libraryPath.Id, path));
+            async () => await AddSong(dbContext, libraryPath.Id, libraryFolder.Id, path));
     }
 
     public async Task<IEnumerable<string>> FindSongPaths(LibraryPath libraryPath)
@@ -121,6 +122,7 @@ public class SongRepository : ISongRepository
     private static async Task<Either<BaseError, MediaItemScanResult<Song>>> AddSong(
         TvContext dbContext,
         int libraryPathId,
+        int libraryFolderId,
         string path)
     {
         try
@@ -128,18 +130,15 @@ public class SongRepository : ISongRepository
             var song = new Song
             {
                 LibraryPathId = libraryPathId,
-                MediaVersions = new List<MediaVersion>
+                MediaVersions =
+                [
+                    new MediaVersion
                     {
-                    new()
+                        MediaFiles = [new MediaFile { Path = path, LibraryFolderId = libraryFolderId }],
-                    {
+                        Streams = []
-                        MediaFiles = new List<MediaFile>
-                        {
-                            new() { Path = path }
-                        },
-                        Streams = new List<MediaStream>()
                     }
-                },
+                ],
-                TraktListItems = new List<TraktListItem>()
+                TraktListItems = []
             };
 
             await dbContext.Songs.AddAsync(song);

ErsatzTV.Infrastructure/Data/Repositories/TelevisionRepository.cs

@@ -356,6 +356,7 @@ public class TelevisionRepository : ITelevisionRepository
     public async Task<Either<BaseError, Episode>> GetOrAddEpisode(
         Season season,
         LibraryPath libraryPath,
+        LibraryFolder libraryFolder,
         string path)
     {
         await using TvContext dbContext = await _dbContextFactory.CreateDbContextAsync();
@@ -407,7 +408,7 @@ public class TelevisionRepository : ITelevisionRepository
 
                 return episode;
             },
-            async () => await AddEpisode(dbContext, season, libraryPath.Id, path));
+            async () => await AddEpisode(dbContext, season, libraryPath.Id, libraryFolder.Id, path));
     }
 
     public async Task<IEnumerable<string>> FindEpisodePaths(LibraryPath libraryPath)
@@ -723,6 +724,7 @@ public class TelevisionRepository : ITelevisionRepository
         TvContext dbContext,
         Season season,
         int libraryPathId,
+        int libraryFolderId,
         string path)
     {
         try
@@ -736,34 +738,31 @@ public class TelevisionRepository : ITelevisionRepository
             {
                 LibraryPathId = libraryPathId,
                 SeasonId = season.Id,
-                EpisodeMetadata = new List<EpisodeMetadata>
+                EpisodeMetadata =
-                {
+                [
-                    new()
+                    new EpisodeMetadata
                     {
                         DateAdded = DateTime.UtcNow,
                         DateUpdated = SystemTime.MinValueUtc,
                         MetadataKind = MetadataKind.Fallback,
-                        Actors = new List<Actor>(),
+                        Actors = [],
-                        Guids = new List<MetadataGuid>(),
+                        Guids = [],
-                        Writers = new List<Writer>(),
+                        Writers = [],
-                        Directors = new List<Director>(),
+                        Directors = [],
-                        Genres = new List<Genre>(),
+                        Genres = [],
-                        Tags = new List<Tag>(),
+                        Tags = [],
-                        Studios = new List<Studio>()
+                        Studios = []
-                    }
+                    }
-                },
+                ],
-                MediaVersions = new List<MediaVersion>
+                MediaVersions =
-                {
+                [
-                    new()
+                    new MediaVersion
-                    {
+                    {
-                        MediaFiles = new List<MediaFile>
+                        MediaFiles = [new MediaFile { Path = path, LibraryFolderId = libraryFolderId }],
-                        {
+                        Streams = []
-                            new() { Path = path }
+                    }
-                        },
+                ],
-                        Streams = new List<MediaStream>()
+                TraktListItems = []
-                    }
-                },
-                TraktListItems = new List<TraktListItem>()
             };
             await dbContext.Episodes.AddAsync(episode);
             await dbContext.SaveChangesAsync();

ErsatzTV.Scanner.Tests/Core/Metadata/MovieFolderScannerTests.cs

@@ -45,7 +45,7 @@ public class MovieFolderScannerTests
         public void SetUp()
         {
             _movieRepository = Substitute.For<IMovieRepository>();
-            _movieRepository.GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>())
+            _movieRepository.GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>())
                 .Returns(
                     args =>
                         Right<BaseError, MediaItemScanResult<Movie>>(new FakeMovieWithPath(args.Arg<string>()))
@@ -73,6 +73,10 @@ public class MovieFolderScannerTests
                     });
 
             _imageCache = Substitute.For<IImageCache>();
+
+            _libraryRepository = Substitute.For<ILibraryRepository>();
+            _libraryRepository.GetOrAddFolder(Arg.Any<LibraryPath>(), Arg.Any<Option<int>>(), Arg.Any<string>())
+                .Returns(new LibraryFolder());
         }
 
         private IMovieRepository _movieRepository;
@@ -80,6 +84,7 @@ public class MovieFolderScannerTests
         private ILocalStatisticsProvider _localStatisticsProvider;
         private ILocalMetadataProvider _localMetadataProvider;
         private IImageCache _imageCache;
+        private ILibraryRepository _libraryRepository;
 
         [Test]
         public async Task NewMovie_Statistics_And_FallbackMetadata(
@@ -106,8 +111,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -147,8 +152,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -187,8 +192,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -228,8 +233,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -273,8 +278,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -319,8 +324,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -365,8 +370,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -410,8 +415,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -451,8 +456,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -494,8 +499,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -531,8 +536,8 @@ public class MovieFolderScannerTests
 
             result.IsRight.Should().BeTrue();
 
-            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<string>());
+            await _movieRepository.Received(1).GetOrAdd(Arg.Any<LibraryPath>(), Arg.Any<LibraryFolder>(), Arg.Any<string>());
-            await _movieRepository.Received(1).GetOrAdd(libraryPath, moviePath);
+            await _movieRepository.Received(1).GetOrAdd(libraryPath, Arg.Any<LibraryFolder>(), moviePath);
 
             await _localStatisticsProvider.Received(1).RefreshStatistics(
                 FFmpegPath,
@@ -615,7 +620,7 @@ public class MovieFolderScannerTests
                 _localMetadataProvider,
                 Substitute.For<IMetadataRepository>(),
                 _imageCache,
-                Substitute.For<ILibraryRepository>(),
+                _libraryRepository,
                 _mediaItemRepository,
                 Substitute.For<IMediator>(),
                 Substitute.For<IFFmpegPngService>(),
@@ -633,7 +638,7 @@ public class MovieFolderScannerTests
                 _localMetadataProvider,
                 Substitute.For<IMetadataRepository>(),
                 _imageCache,
-                Substitute.For<ILibraryRepository>(),
+                _libraryRepository,
                 _mediaItemRepository,
                 Substitute.For<IMediator>(),
                 Substitute.For<IFFmpegPngService>(),

ErsatzTV.Scanner/Core/Metadata/ImageFolderScanner.cs

@@ -75,6 +75,14 @@ public class ImageFolderScanner : LocalFolderScanner, IImageFolderScanner
             var allFolders = new System.Collections.Generic.HashSet<string>();
             var folderQueue = new Queue<string>();
 
+            string normalizedLibraryPath = libraryPath.Path.TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar);
+            if (libraryPath.Path != normalizedLibraryPath)
+            {
+                await _libraryRepository.UpdatePath(libraryPath, normalizedLibraryPath);
+            }
+            
             if (ShouldIncludeFolder(libraryPath.Path) && allFolders.Add(libraryPath.Path))
             {
                 folderQueue.Enqueue(libraryPath.Path);
@@ -106,6 +114,8 @@ public class ImageFolderScanner : LocalFolderScanner, IImageFolderScanner
                     cancellationToken);
 
                 string imageFolder = folderQueue.Dequeue();
+                Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(imageFolder);
+                
                 foldersCompleted++;
 
                 var filesForEtag = _localFileSystem.ListFiles(imageFolder).ToList();
@@ -124,29 +134,27 @@ public class ImageFolderScanner : LocalFolderScanner, IImageFolderScanner
                 }
 
                 string etag = FolderEtag.Calculate(imageFolder, _localFileSystem);
-                Option<LibraryFolder> knownFolder = libraryPath.LibraryFolders
+                LibraryFolder knownFolder = await _libraryRepository.GetOrAddFolder(
-                    .Filter(f => f.Path == imageFolder)
+                    libraryPath,
-                    .HeadOrNone();
+                    maybeParentFolder,
+                    imageFolder);
 
                 // skip folder if etag matches
-                if (allFiles.Count == 0 ||
+                if (allFiles.Count == 0 || knownFolder.Etag == etag)
-                    await knownFolder.Map(f => f.Etag ?? string.Empty).IfNoneAsync(string.Empty) ==
-                    etag)
                 {
                     continue;
                 }
 
-                _logger.LogDebug(
+                _logger.LogDebug("UPDATE: Etag has changed for folder {Folder}", imageFolder);
-                    "UPDATE: Etag has changed for folder {Folder}",
-                    imageFolder);
 
                 var hasErrors = false;
 
                 foreach (string file in allFiles.OrderBy(identity))
                 {
                     Either<BaseError, MediaItemScanResult<Image>> maybeVideo = await _imageRepository
-                        .GetOrAdd(libraryPath, file)
+                        .GetOrAdd(libraryPath, knownFolder, file)
                         .BindT(video => UpdateStatistics(video, ffmpegPath, ffprobePath))
+                        .BindT(video => UpdateLibraryFolderId(video, knownFolder))
                         .BindT(UpdateMetadata)
                         //.BindT(video => UpdateThumbnail(video, cancellationToken))
                         //.BindT(UpdateSubtitles)
@@ -221,6 +229,20 @@ public class ImageFolderScanner : LocalFolderScanner, IImageFolderScanner
         }
     }
 
+    private async Task<Either<BaseError, MediaItemScanResult<Image>>> UpdateLibraryFolderId(
+        MediaItemScanResult<Image> video,
+        LibraryFolder libraryFolder)
+    {
+        MediaFile mediaFile = video.Item.GetHeadVersion().MediaFiles.Head();
+        if (mediaFile.LibraryFolderId != libraryFolder.Id)
+        {
+            await _libraryRepository.UpdateLibraryFolderId(mediaFile, libraryFolder.Id);
+            video.IsUpdated = true;
+        }
+
+        return video;
+    }
+
     private async Task<Either<BaseError, MediaItemScanResult<Image>>> UpdateMetadata(
         MediaItemScanResult<Image> result)
     {

ErsatzTV.Scanner/Core/Metadata/MovieFolderScanner.cs

@@ -3,6 +3,7 @@ using Bugsnag;
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -82,6 +83,15 @@ public class MovieFolderScanner : LocalFolderScanner, IMovieFolderScanner
             var foldersCompleted = 0;
 
             var folderQueue = new Queue<string>();
+            
+            string normalizedLibraryPath = libraryPath.Path.TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar);
+            if (libraryPath.Path != normalizedLibraryPath)
+            {
+                await _libraryRepository.UpdatePath(libraryPath, normalizedLibraryPath);
+            }
+            
             foreach (string folder in _localFileSystem.ListSubdirectories(libraryPath.Path)
                          .Filter(ShouldIncludeFolder)
                          .OrderBy(identity))
@@ -107,6 +117,7 @@ public class MovieFolderScanner : LocalFolderScanner, IMovieFolderScanner
                     cancellationToken);
 
                 string movieFolder = folderQueue.Dequeue();
+                Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(movieFolder);
                 foldersCompleted++;
 
                 var filesForEtag = _localFileSystem.ListFiles(movieFolder).ToList();
@@ -120,9 +131,10 @@ public class MovieFolderScanner : LocalFolderScanner, IMovieFolderScanner
                     .ToList();
 
                 string etag = FolderEtag.Calculate(movieFolder, _localFileSystem);
-                Option<LibraryFolder> knownFolder = libraryPath.LibraryFolders
+                LibraryFolder knownFolder = await _libraryRepository.GetOrAddFolder(
-                    .Filter(f => f.Path == movieFolder)
+                    libraryPath,
-                    .HeadOrNone();
+                    maybeParentFolder,
+                    movieFolder);
 
                 if (allFiles.Count == 0)
                 {
@@ -134,16 +146,12 @@ public class MovieFolderScanner : LocalFolderScanner, IMovieFolderScanner
                     }
 
                     // store etag for now-empty folders
-                    if (knownFolder.IsSome)
-                    {
                     await _libraryRepository.SetEtag(libraryPath, knownFolder, movieFolder, etag);
-                    }
 
                     continue;
                 }
 
-                bool etagMatches = await knownFolder.Map(f => f.Etag ?? string.Empty).IfNoneAsync(string.Empty) == etag;
+                if (knownFolder.Etag == etag)
-                if (etagMatches)
                 {
                     if (allFiles.Any(allTrashedItems.Contains))
                     {
@@ -166,8 +174,9 @@ public class MovieFolderScanner : LocalFolderScanner, IMovieFolderScanner
                 {
                     // TODO: figure out how to rebuild playlists
                     Either<BaseError, MediaItemScanResult<Movie>> maybeMovie = await _movieRepository
-                        .GetOrAdd(libraryPath, file)
+                        .GetOrAdd(libraryPath, knownFolder, file)
                         .BindT(movie => UpdateStatistics(movie, ffmpegPath, ffprobePath))
+                        .BindT(video => UpdateLibraryFolderId(video, knownFolder))
                         .BindT(UpdateMetadata)
                         .BindT(movie => UpdateArtwork(movie, ArtworkKind.Poster, cancellationToken))
                         .BindT(movie => UpdateArtwork(movie, ArtworkKind.FanArt, cancellationToken))
@@ -227,6 +236,20 @@ public class MovieFolderScanner : LocalFolderScanner, IMovieFolderScanner
         }
     }
     
+    private async Task<Either<BaseError, MediaItemScanResult<Movie>>> UpdateLibraryFolderId(
+        MediaItemScanResult<Movie> video,
+        LibraryFolder libraryFolder)
+    {
+        MediaFile mediaFile = video.Item.GetHeadVersion().MediaFiles.Head();
+        if (mediaFile.LibraryFolderId != libraryFolder.Id)
+        {
+            await _libraryRepository.UpdateLibraryFolderId(mediaFile, libraryFolder.Id);
+            video.IsUpdated = true;
+        }
+
+        return video;
+    }
+
     private async Task<Either<BaseError, MediaItemScanResult<Movie>>> UpdateMetadata(
         MediaItemScanResult<Movie> result)
     {

ErsatzTV.Scanner/Core/Metadata/MusicVideoFolderScanner.cs

@@ -2,6 +2,7 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -75,6 +76,14 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
         {
             decimal progressSpread = progressMax - progressMin;
 
+            string normalizedLibraryPath = libraryPath.Path.TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar);
+            if (libraryPath.Path != normalizedLibraryPath)
+            {
+                await _libraryRepository.UpdatePath(libraryPath, normalizedLibraryPath);
+            }
+
             var allArtistFolders = _localFileSystem.ListSubdirectories(libraryPath.Path)
                 .Filter(ShouldIncludeFolder)
                 .OrderBy(identity)
@@ -316,6 +325,8 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
             }
 
             string musicVideoFolder = folderQueue.Dequeue();
+            Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(musicVideoFolder);
+
             // _logger.LogDebug("Scanning music video folder {Folder}", musicVideoFolder);
 
             var allFiles = _localFileSystem.ListFiles(musicVideoFolder)
@@ -323,19 +334,19 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
                 .Filter(f => !Path.GetFileName(f).StartsWith("._", StringComparison.OrdinalIgnoreCase))
                 .ToList();
 
-            foreach (string subdirectory in _localFileSystem.ListSubdirectories(musicVideoFolder)
+            foreach (string subdirectory in _localFileSystem.ListSubdirectories(musicVideoFolder).OrderBy(identity))
-                         .OrderBy(identity))
             {
                 folderQueue.Enqueue(subdirectory);
             }
 
             string etag = FolderEtag.Calculate(musicVideoFolder, _localFileSystem);
-            Option<LibraryFolder> knownFolder = libraryPath.LibraryFolders
+            LibraryFolder knownFolder = await _libraryRepository.GetOrAddFolder(
-                .Filter(f => f.Path == musicVideoFolder)
+                libraryPath,
-                .HeadOrNone();
+                maybeParentFolder,
+                musicVideoFolder);
 
             // skip folder if etag matches
-            if (await knownFolder.Map(f => f.Etag ?? string.Empty).IfNoneAsync(string.Empty) == etag)
+            if (knownFolder.Etag == etag)
             {
                 continue;
             }
@@ -346,8 +357,9 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
             {
                 // TODO: figure out how to rebuild playouts
                 Either<BaseError, MediaItemScanResult<MusicVideo>> maybeMusicVideo = await _musicVideoRepository
-                    .GetOrAdd(artist, libraryPath, file)
+                    .GetOrAdd(artist, libraryPath, knownFolder, file)
                     .BindT(musicVideo => UpdateStatistics(musicVideo, ffmpegPath, ffprobePath))
+                    .BindT(video => UpdateLibraryFolderId(video, knownFolder))
                     .BindT(UpdateMetadata)
                     .BindT(result => UpdateThumbnail(result, cancellationToken))
                     .BindT(UpdateSubtitles)
@@ -385,6 +397,20 @@ public class MusicVideoFolderScanner : LocalFolderScanner, IMusicVideoFolderScan
         return Unit.Default;
     }
     
+    private async Task<Either<BaseError, MediaItemScanResult<MusicVideo>>> UpdateLibraryFolderId(
+        MediaItemScanResult<MusicVideo> video,
+        LibraryFolder libraryFolder)
+    {
+        MediaFile mediaFile = video.Item.GetHeadVersion().MediaFiles.Head();
+        if (mediaFile.LibraryFolderId != libraryFolder.Id)
+        {
+            await _libraryRepository.UpdateLibraryFolderId(mediaFile, libraryFolder.Id);
+            video.IsUpdated = true;
+        }
+
+        return video;
+    }
+
     private async Task<Either<BaseError, MediaItemScanResult<MusicVideo>>> UpdateMetadata(
         MediaItemScanResult<MusicVideo> result)
     {

ErsatzTV.Scanner/Core/Metadata/OtherVideoFolderScanner.cs

@@ -2,6 +2,7 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -77,6 +78,14 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
             var allFolders = new System.Collections.Generic.HashSet<string>();
             var folderQueue = new Queue<string>();
             
+            string normalizedLibraryPath = libraryPath.Path.TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar);
+            if (libraryPath.Path != normalizedLibraryPath)
+            {
+                await _libraryRepository.UpdatePath(libraryPath, normalizedLibraryPath);
+            }
+
             if (ShouldIncludeFolder(libraryPath.Path) && allFolders.Add(libraryPath.Path))
             {
                 folderQueue.Enqueue(libraryPath.Path);
@@ -108,6 +117,8 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
                     cancellationToken);
 
                 string otherVideoFolder = folderQueue.Dequeue();
+                Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(otherVideoFolder);
+
                 foldersCompleted++;
 
                 var filesForEtag = _localFileSystem.ListFiles(otherVideoFolder).ToList();
@@ -126,14 +137,13 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
                 }
 
                 string etag = FolderEtag.Calculate(otherVideoFolder, _localFileSystem);
-                Option<LibraryFolder> knownFolder = libraryPath.LibraryFolders
+                LibraryFolder knownFolder = await _libraryRepository.GetOrAddFolder(
-                    .Filter(f => f.Path == otherVideoFolder)
+                    libraryPath,
-                    .HeadOrNone();
+                    maybeParentFolder,
+                    otherVideoFolder);
 
                 // skip folder if etag matches
-                if (allFiles.Count == 0 ||
+                if (allFiles.Count == 0 || knownFolder.Etag == etag)
-                    await knownFolder.Map(f => f.Etag ?? string.Empty).IfNoneAsync(string.Empty) ==
-                    etag)
                 {
                     continue;
                 }
@@ -147,8 +157,9 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
                 foreach (string file in allFiles.OrderBy(identity))
                 {
                     Either<BaseError, MediaItemScanResult<OtherVideo>> maybeVideo = await _otherVideoRepository
-                        .GetOrAdd(libraryPath, file)
+                        .GetOrAdd(libraryPath, knownFolder, file)
                         .BindT(video => UpdateStatistics(video, ffmpegPath, ffprobePath))
+                        .BindT(video => UpdateLibraryFolderId(video, knownFolder))
                         .BindT(UpdateMetadata)
                         .BindT(video => UpdateThumbnail(video, cancellationToken))
                         .BindT(UpdateSubtitles)
@@ -223,6 +234,20 @@ public class OtherVideoFolderScanner : LocalFolderScanner, IOtherVideoFolderScan
         }
     }
     
+    private async Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> UpdateLibraryFolderId(
+        MediaItemScanResult<OtherVideo> video,
+        LibraryFolder libraryFolder)
+    {
+        MediaFile mediaFile = video.Item.GetHeadVersion().MediaFiles.Head();
+        if (mediaFile.LibraryFolderId != libraryFolder.Id)
+        {
+            await _libraryRepository.UpdateLibraryFolderId(mediaFile, libraryFolder.Id);
+            video.IsUpdated = true;
+        }
+
+        return video;
+    }
+
     private async Task<Either<BaseError, MediaItemScanResult<OtherVideo>>> UpdateMetadata(
         MediaItemScanResult<OtherVideo> result)
     {

ErsatzTV.Scanner/Core/Metadata/SongFolderScanner.cs

@@ -74,6 +74,14 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
 
             var folderQueue = new Queue<string>();
             
+            string normalizedLibraryPath = libraryPath.Path.TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar);
+            if (libraryPath.Path != normalizedLibraryPath)
+            {
+                await _libraryRepository.UpdatePath(libraryPath, normalizedLibraryPath);
+            }
+
             if (ShouldIncludeFolder(libraryPath.Path))
             {
                 folderQueue.Enqueue(libraryPath.Path);
@@ -104,6 +112,8 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
                     cancellationToken);
 
                 string songFolder = folderQueue.Dequeue();
+                Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(songFolder);
+
                 foldersCompleted++;
 
                 var filesForEtag = _localFileSystem.ListFiles(songFolder).ToList();
@@ -121,14 +131,13 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
                 }
 
                 string etag = FolderEtag.Calculate(songFolder, _localFileSystem);
-                Option<LibraryFolder> knownFolder = libraryPath.LibraryFolders
+                LibraryFolder knownFolder = await _libraryRepository.GetOrAddFolder(
-                    .Filter(f => f.Path == songFolder)
+                    libraryPath,
-                    .HeadOrNone();
+                    maybeParentFolder,
+                    songFolder);
 
                 // skip folder if etag matches
-                if (allFiles.Count == 0 ||
+                if (allFiles.Count == 0 || knownFolder.Etag == etag)
-                    await knownFolder.Map(f => f.Etag ?? string.Empty).IfNoneAsync(string.Empty) ==
-                    etag)
                 {
                     continue;
                 }
@@ -142,10 +151,11 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
                 foreach (string file in allFiles.OrderBy(identity))
                 {
                     Either<BaseError, MediaItemScanResult<Song>> maybeSong = await _songRepository
-                        .GetOrAdd(libraryPath, file)
+                        .GetOrAdd(libraryPath, knownFolder, file)
                         .BindT(video => UpdateStatistics(video, ffmpegPath, ffprobePath))
+                        .BindT(video => UpdateLibraryFolderId(video, knownFolder))
                         .BindT(UpdateMetadata)
-                        .BindT(video => UpdateThumbnail(video, ffmpegPath, cancellationToken))
+                        .BindT(video => UpdateThumbnail(video, knownFolder, ffmpegPath, cancellationToken))
                         .BindT(FlagNormal);
 
                     foreach (BaseError error in maybeSong.LeftToSeq())
@@ -217,6 +227,20 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
         }
     }
     
+    private async Task<Either<BaseError, MediaItemScanResult<Song>>> UpdateLibraryFolderId(
+        MediaItemScanResult<Song> result,
+        LibraryFolder libraryFolder)
+    {
+        MediaFile mediaFile = result.Item.GetHeadVersion().MediaFiles.Head();
+        if (mediaFile.LibraryFolderId != libraryFolder.Id)
+        {
+            await _libraryRepository.UpdateLibraryFolderId(mediaFile, libraryFolder.Id);
+            result.IsUpdated = true;
+        }
+
+        return result;
+    }
+
     private async Task<Either<BaseError, MediaItemScanResult<Song>>> UpdateMetadata(MediaItemScanResult<Song> result)
     {
         try
@@ -251,6 +275,7 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
 
     private async Task<Either<BaseError, MediaItemScanResult<Song>>> UpdateThumbnail(
         MediaItemScanResult<Song> result,
+        LibraryFolder knownFolder,
         string ffmpegPath,
         CancellationToken cancellationToken)
     {
@@ -261,7 +286,7 @@ public class SongFolderScanner : LocalFolderScanner, ISongFolderScanner
             {
                 LibraryPath libraryPath = result.Item.LibraryPath;
                 string path = result.Item.GetHeadVersion().MediaFiles.Head().Path;
-                foreach (MediaItemScanResult<Song> s in (await _songRepository.GetOrAdd(libraryPath, path))
+                foreach (MediaItemScanResult<Song> s in (await _songRepository.GetOrAdd(libraryPath, knownFolder, path))
                          .RightToSeq())
                 {
                     result.Item = s.Item;

ErsatzTV.Scanner/Core/Metadata/TelevisionFolderScanner.cs

@@ -2,6 +2,7 @@
 using ErsatzTV.Core;
 using ErsatzTV.Core.Domain;
 using ErsatzTV.Core.Errors;
+using ErsatzTV.Core.Extensions;
 using ErsatzTV.Core.Interfaces.FFmpeg;
 using ErsatzTV.Core.Interfaces.Images;
 using ErsatzTV.Core.Interfaces.Metadata;
@@ -77,6 +78,14 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
         {
             decimal progressSpread = progressMax - progressMin;
             
+            string normalizedLibraryPath = libraryPath.Path.TrimEnd(
+                Path.DirectorySeparatorChar,
+                Path.AltDirectorySeparatorChar);
+            if (libraryPath.Path != normalizedLibraryPath)
+            {
+                await _libraryRepository.UpdatePath(libraryPath, normalizedLibraryPath);
+            }
+
             var allShowFolders = _localFileSystem.ListSubdirectories(libraryPath.Path)
                 .Filter(ShouldIncludeFolder)
                 .OrderBy(identity)
@@ -99,6 +108,14 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
                         Array.Empty<int>()),
                     cancellationToken);
                 
+                Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(showFolder);
+                
+                // this folder is unused by the show, but will be used as parents of season folders
+                LibraryFolder _ = await _libraryRepository.GetOrAddFolder(
+                    libraryPath,
+                    maybeParentFolder,
+                    showFolder);
+
                 Either<BaseError, MediaItemScanResult<Show>> maybeShow =
                     await FindOrCreateShow(libraryPath.Id, showFolder)
                         .BindT(show => UpdateMetadataForShow(show, showFolder))
@@ -220,13 +237,16 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
                 return new ScanCanceled();
             }
             
+            Option<int> maybeParentFolder = await _libraryRepository.GetParentFolderId(seasonFolder);
+
             string etag = FolderEtag.CalculateWithSubfolders(seasonFolder, _localFileSystem);
-            Option<LibraryFolder> knownFolder = libraryPath.LibraryFolders
+            LibraryFolder knownFolder = await _libraryRepository.GetOrAddFolder(
-                .Filter(f => f.Path == seasonFolder)
+                libraryPath,
-                .HeadOrNone();
+                maybeParentFolder,
+                seasonFolder);
 
             // skip folder if etag matches
-            if (await knownFolder.Map(f => f.Etag ?? string.Empty).IfNoneAsync(string.Empty) == etag)
+            if (knownFolder.Etag == etag)
             {
                 continue;
             }
@@ -251,6 +271,7 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
                 {
                     Either<BaseError, Unit> scanResult = await ScanEpisodes(
                         libraryPath,
+                        knownFolder,
                         ffmpegPath,
                         ffprobePath,
                         season,
@@ -283,6 +304,7 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
 
     private async Task<Either<BaseError, Unit>> ScanEpisodes(
         LibraryPath libraryPath,
+        LibraryFolder seasonFolder,
         string ffmpegPath,
         string ffprobePath,
         Season season,
@@ -302,10 +324,11 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
         {
             // TODO: figure out how to rebuild playlists
             Either<BaseError, Episode> maybeEpisode = await _televisionRepository
-                .GetOrAddEpisode(season, libraryPath, file)
+                .GetOrAddEpisode(season, libraryPath, seasonFolder, file)
                 .BindT(
                     episode => UpdateStatistics(new MediaItemScanResult<Episode>(episode), ffmpegPath, ffprobePath)
                         .MapT(_ => episode))
+                .BindT(video => UpdateLibraryFolderId(video, seasonFolder))
                 .BindT(UpdateMetadata)
                 .BindT(e => UpdateThumbnail(e, cancellationToken))
                 .BindT(UpdateSubtitles)
@@ -404,6 +427,17 @@ public class TelevisionFolderScanner : LocalFolderScanner, ITelevisionFolderScan
         return season;
     }
     
+    private async Task<Either<BaseError, Episode>> UpdateLibraryFolderId(Episode episode, LibraryFolder libraryFolder)
+    {
+        MediaFile mediaFile = episode.GetHeadVersion().MediaFiles.Head();
+        if (mediaFile.LibraryFolderId != libraryFolder.Id)
+        {
+            await _libraryRepository.UpdateLibraryFolderId(mediaFile, libraryFolder.Id);
+        }
+
+        return episode;
+    }
+
     private async Task<Either<BaseError, Episode>> UpdateMetadata(Episode episode)
     {
         try