From 7e720b292d7b9574de523ffd635de6bde763e950 Mon Sep 17 00:00:00 2001
From: aryan447 <singharyan4477@gmail.com>
Date: Sat, 7 Nov 2026 12:34:39 +0530
Subject: [PATCH 1/3] feat(series): support user-created custom shows and
 episode ordering
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Add custom_series and custom_series_item Room v10 tables with MIGRATION_9_10
- Exclude claimed custom series videos from scanner grouping to avoid duplicate entries
- Provide 'Add to series…' in Folders/Files selection mode and 'Create series' in Shows
- Add CustomSeriesBuilderScreen with drag-reorder, explicit season/episodes, and poster picker
- Render custom series in SeriesDetailScreen with Edit and non-destructive Delete grouping
- Add unit tests in CustomSeriesTest and update CHANGELOG.md
---
 CHANGELOG.md                                  |   4 +
 .../mpvium/database/MpviumDatabase.kt         |   9 +-
 .../mpvium/database/dao/CustomSeriesDao.kt    |  82 ++
 .../database/entities/CustomSeriesEntity.kt   |  15 +
 .../entities/CustomSeriesItemEntity.kt        |  31 +
 .../repository/CustomSeriesRepository.kt      | 167 ++++
 .../app/aryan447/mpvium/di/DatabaseModule.kt  |  69 +-
 .../mpvium/domain/streaming/SeriesDetector.kt | 147 ++-
 .../ui/browser/components/BrowserTopBar.kt    |  18 +
 .../browser/components/FloatingBottomBar.kt   |  25 +
 .../ui/browser/dialogs/AddToSeriesDialog.kt   | 195 ++++
 .../filesystem/FileSystemBrowserScreen.kt     |  24 +
 .../ui/browser/videolist/VideoListScreen.kt   |  21 +
 .../series/CustomSeriesBuilderScreen.kt       | 923 ++++++++++++++++++
 .../ui/streaming/series/SeriesDetailScreen.kt | 116 ++-
 .../ui/streaming/series/SeriesGridScreen.kt   |  13 +-
 app/src/main/res/values/strings.xml           |  21 +
 .../domain/streaming/CustomSeriesTest.kt      | 170 ++++
 18 files changed, 2026 insertions(+), 24 deletions(-)
 create mode 100644 app/src/main/java/app/aryan447/mpvium/database/dao/CustomSeriesDao.kt
 create mode 100644 app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesEntity.kt
 create mode 100644 app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesItemEntity.kt
 create mode 100644 app/src/main/java/app/aryan447/mpvium/database/repository/CustomSeriesRepository.kt
 create mode 100644 app/src/main/java/app/aryan447/mpvium/ui/browser/dialogs/AddToSeriesDialog.kt
 create mode 100644 app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt
 create mode 100644 app/src/test/java/app/aryan447/mpvium/domain/streaming/CustomSeriesTest.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b6dd758..ec4a2efb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@
 ### Added
 
 - Modern player layout option (Settings → Appearance → Player Layout): modeled after Apple TV's native player interface. Features a top-left floating glass pill with close (✕) and PiP buttons; expandable top-right Volume & Brightness controls with live scrub percentage readout and round toggle button; center floating circular glass transport controls (10s skip and hero play/pause); bottom-left two-line show title (episode name on top, series name with chevron below for TV shows, or single clean movie title for movies); customizable bottom-right actions pill (Subtitles, Audio Track, Explain, and Menu); theme-colored seekbar with elapsed/remaining timers, chapter dividers gated by settings, and system gesture navigation clearance; and tactile haptic feedback across all controls.
+- Custom series: create and edit your own TV shows from any videos with custom title, release year, poster cover, and drag-and-drop episode reordering with explicit season and episode numbering.
+- Custom series entry points: selection mode in Folders and Files tabs now features "Add to series…" next to "Add to playlist", and the Shows tab header includes a direct "Create series" action with helpful empty-state guidance.
+- Series detail screen integration: custom series render identically to auto-detected shows with deterministic identifiers (`custom:<id>`), with dedicated Edit and safe Delete actions that remove only the series grouping without touching underlying video files.
+- Library exclusion overlay: videos claimed by a custom series are automatically excluded from automatic scanner grouping to eliminate duplicate entries in TV shows and movies.
 - Unified Titles tab combining TV shows and movies into a single browsing experience at canonical index 1, with a segment control (All, TV Shows, Movies) as the primary filter row, watch-state and duration filter dropdown buttons, normalized sorting (Name, Recently added, Rating, Longest, Shortest), and layout toggle (grid/list).
 - Option under Settings → Appearance → Bottom navigation to separate TV Shows and Movies into distinct tabs instead of the unified Titles tab, with individual visibility toggles for each.
 - Reserved historical canonical index 2 for launcher shortcuts and external tab requests, automatically opening Titles with the Movies filter preselected.
diff --git a/app/src/main/java/app/aryan447/mpvium/database/MpviumDatabase.kt b/app/src/main/java/app/aryan447/mpvium/database/MpviumDatabase.kt
index b9e00c35..8214c22f 100644
--- a/app/src/main/java/app/aryan447/mpvium/database/MpviumDatabase.kt
+++ b/app/src/main/java/app/aryan447/mpvium/database/MpviumDatabase.kt
@@ -4,12 +4,15 @@ import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
 import app.aryan447.mpvium.database.converters.NetworkProtocolConverter
+import app.aryan447.mpvium.database.dao.CustomSeriesDao
 import app.aryan447.mpvium.database.dao.LibraryIndexDao
 import app.aryan447.mpvium.database.dao.NetworkConnectionDao
 import app.aryan447.mpvium.database.dao.PlaybackStateDao
 import app.aryan447.mpvium.database.dao.PlaylistDao
 import app.aryan447.mpvium.database.dao.RecentlyPlayedDao
 import app.aryan447.mpvium.database.dao.VideoMetadataDao
+import app.aryan447.mpvium.database.entities.CustomSeriesEntity
+import app.aryan447.mpvium.database.entities.CustomSeriesItemEntity
 import app.aryan447.mpvium.database.entities.LibraryIndexEntity
 import app.aryan447.mpvium.database.entities.PlaybackStateEntity
 import app.aryan447.mpvium.database.entities.PlaylistEntity
@@ -27,8 +30,10 @@ import app.aryan447.mpvium.domain.network.NetworkConnection
     PlaylistEntity::class,
     PlaylistItemEntity::class,
     LibraryIndexEntity::class,
+    CustomSeriesEntity::class,
+    CustomSeriesItemEntity::class,
   ],
-  version = 9,
+  version = 10,
   exportSchema = true,
 )
 @TypeConverters(NetworkProtocolConverter::class)
@@ -44,4 +49,6 @@ abstract class MpviumDatabase : RoomDatabase() {
   abstract fun playlistDao(): PlaylistDao
 
   abstract fun libraryIndexDao(): LibraryIndexDao
+
+  abstract fun customSeriesDao(): CustomSeriesDao
 }
diff --git a/app/src/main/java/app/aryan447/mpvium/database/dao/CustomSeriesDao.kt b/app/src/main/java/app/aryan447/mpvium/database/dao/CustomSeriesDao.kt
new file mode 100644
index 00000000..a8339d23
--- /dev/null
+++ b/app/src/main/java/app/aryan447/mpvium/database/dao/CustomSeriesDao.kt
@@ -0,0 +1,82 @@
+package app.aryan447.mpvium.database.dao
+
+import androidx.room.Dao
+import androidx.room.Delete
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import androidx.room.Transaction
+import androidx.room.Update
+import app.aryan447.mpvium.database.entities.CustomSeriesEntity
+import app.aryan447.mpvium.database.entities.CustomSeriesItemEntity
+import kotlinx.coroutines.flow.Flow
+
+@Dao
+interface CustomSeriesDao {
+
+  @Insert(onConflict = OnConflictStrategy.REPLACE)
+  suspend fun insertSeries(series: CustomSeriesEntity): Long
+
+  @Update
+  suspend fun updateSeries(series: CustomSeriesEntity)
+
+  @Delete
+  suspend fun deleteSeries(series: CustomSeriesEntity)
+
+  @Query("DELETE FROM custom_series WHERE id = :seriesId")
+  suspend fun deleteSeriesById(seriesId: Int)
+
+  @Query("SELECT * FROM custom_series WHERE id = :seriesId")
+  suspend fun getSeriesById(seriesId: Int): CustomSeriesEntity?
+
+  @Query("SELECT * FROM custom_series WHERE id = :seriesId")
+  fun observeSeriesById(seriesId: Int): Flow<CustomSeriesEntity?>
+
+  @Query("SELECT * FROM custom_series ORDER BY updatedAt DESC")
+  fun observeAllSeries(): Flow<List<CustomSeriesEntity>>
+
+  @Query("SELECT * FROM custom_series ORDER BY updatedAt DESC")
+  suspend fun getAllSeries(): List<CustomSeriesEntity>
+
+  @Insert(onConflict = OnConflictStrategy.REPLACE)
+  suspend fun insertItem(item: CustomSeriesItemEntity): Long
+
+  @Insert(onConflict = OnConflictStrategy.REPLACE)
+  suspend fun insertItems(items: List<CustomSeriesItemEntity>)
+
+  @Update
+  suspend fun updateItem(item: CustomSeriesItemEntity)
+
+  @Delete
+  suspend fun deleteItem(item: CustomSeriesItemEntity)
+
+  @Query("DELETE FROM custom_series_item WHERE seriesId = :seriesId")
+  suspend fun deleteItemsBySeriesId(seriesId: Int)
+
+  @Query("DELETE FROM custom_series_item WHERE id = :itemId")
+  suspend fun deleteItemById(itemId: Int)
+
+  @Query("SELECT * FROM custom_series_item WHERE seriesId = :seriesId ORDER BY position ASC")
+  suspend fun getItemsForSeries(seriesId: Int): List<CustomSeriesItemEntity>
+
+  @Query("SELECT * FROM custom_series_item WHERE seriesId = :seriesId ORDER BY position ASC")
+  fun observeItemsForSeries(seriesId: Int): Flow<List<CustomSeriesItemEntity>>
+
+  @Query("SELECT * FROM custom_series_item ORDER BY seriesId ASC, position ASC")
+  suspend fun getAllItems(): List<CustomSeriesItemEntity>
+
+  @Query("SELECT * FROM custom_series_item ORDER BY seriesId ASC, position ASC")
+  fun observeAllItems(): Flow<List<CustomSeriesItemEntity>>
+
+  @Query("SELECT MAX(position) FROM custom_series_item WHERE seriesId = :seriesId")
+  suspend fun getMaxPosition(seriesId: Int): Int?
+
+  @Query("UPDATE custom_series_item SET position = :newPosition WHERE id = :itemId")
+  suspend fun updateItemPosition(itemId: Int, newPosition: Int)
+
+  @Transaction
+  suspend fun replaceSeriesItems(seriesId: Int, items: List<CustomSeriesItemEntity>) {
+    deleteItemsBySeriesId(seriesId)
+    insertItems(items)
+  }
+}
diff --git a/app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesEntity.kt b/app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesEntity.kt
new file mode 100644
index 00000000..324d7e80
--- /dev/null
+++ b/app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesEntity.kt
@@ -0,0 +1,15 @@
+package app.aryan447.mpvium.database.entities
+
+import androidx.room.Entity
+import androidx.room.PrimaryKey
+
+@Entity(tableName = "custom_series")
+data class CustomSeriesEntity(
+  @PrimaryKey(autoGenerate = true) val id: Int = 0,
+  val title: String,
+  val year: String? = null,
+  val posterPath: String? = null,
+  val tmdbId: Int? = null,
+  val createdAt: Long,
+  val updatedAt: Long,
+)
diff --git a/app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesItemEntity.kt b/app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesItemEntity.kt
new file mode 100644
index 00000000..62fc38cd
--- /dev/null
+++ b/app/src/main/java/app/aryan447/mpvium/database/entities/CustomSeriesItemEntity.kt
@@ -0,0 +1,31 @@
+package app.aryan447.mpvium.database.entities
+
+import androidx.room.Entity
+import androidx.room.ForeignKey
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(
+  tableName = "custom_series_item",
+  foreignKeys = [
+    ForeignKey(
+      entity = CustomSeriesEntity::class,
+      parentColumns = ["id"],
+      childColumns = ["seriesId"],
+      onDelete = ForeignKey.CASCADE,
+    ),
+  ],
+  indices = [
+    Index(value = ["seriesId"]),
+    Index(value = ["filePath"]),
+  ],
+)
+data class CustomSeriesItemEntity(
+  @PrimaryKey(autoGenerate = true) val id: Int = 0,
+  val seriesId: Int,
+  val filePath: String,
+  val fileName: String,
+  val season: Int,
+  val episode: Int,
+  val position: Int,
+)
diff --git a/app/src/main/java/app/aryan447/mpvium/database/repository/CustomSeriesRepository.kt b/app/src/main/java/app/aryan447/mpvium/database/repository/CustomSeriesRepository.kt
new file mode 100644
index 00000000..97a7d0e4
--- /dev/null
+++ b/app/src/main/java/app/aryan447/mpvium/database/repository/CustomSeriesRepository.kt
@@ -0,0 +1,167 @@
+package app.aryan447.mpvium.database.repository
+
+import app.aryan447.mpvium.database.dao.CustomSeriesDao
+import app.aryan447.mpvium.database.entities.CustomSeriesEntity
+import app.aryan447.mpvium.database.entities.CustomSeriesItemEntity
+import app.aryan447.mpvium.domain.media.model.Video
+import app.aryan447.mpvium.domain.streaming.StreamingArtworkStore
+import app.aryan447.mpvium.utils.media.MediaInfoParser
+import kotlinx.coroutines.flow.Flow
+
+data class CustomSeriesItemDraft(
+  val id: Int = 0,
+  val filePath: String,
+  val fileName: String,
+  val season: Int = 1,
+  val episode: Int = 1,
+  val position: Int = 0,
+)
+
+class CustomSeriesRepository(
+  private val customSeriesDao: CustomSeriesDao,
+  private val artworkStore: StreamingArtworkStore,
+) {
+
+  suspend fun createSeries(
+    title: String,
+    year: String? = null,
+    posterPath: String? = null,
+    tmdbId: Int? = null,
+    items: List<CustomSeriesItemDraft> = emptyList(),
+  ): Long {
+    val now = System.currentTimeMillis()
+    val cleanTitle = title.trim()
+    val cleanYear = year?.trim()?.takeIf { it.isNotBlank() }
+    val cleanPoster = posterPath?.trim()?.takeIf { it.isNotBlank() }
+
+    val seriesId = customSeriesDao.insertSeries(
+      CustomSeriesEntity(
+        title = cleanTitle,
+        year = cleanYear,
+        posterPath = cleanPoster,
+        tmdbId = tmdbId,
+        createdAt = now,
+        updatedAt = now,
+      )
+    )
+
+    if (items.isNotEmpty()) {
+      val entities = items.mapIndexed { index, draft ->
+        CustomSeriesItemEntity(
+          seriesId = seriesId.toInt(),
+          filePath = draft.filePath,
+          fileName = draft.fileName,
+          season = draft.season.coerceAtLeast(0),
+          episode = draft.episode.coerceAtLeast(1),
+          position = if (draft.position >= 0) draft.position else index,
+        )
+      }
+      customSeriesDao.insertItems(entities)
+    }
+
+    return seriesId
+  }
+
+  suspend fun updateSeries(
+    id: Int,
+    title: String,
+    year: String? = null,
+    posterPath: String? = null,
+    tmdbId: Int? = null,
+    items: List<CustomSeriesItemDraft>,
+  ) {
+    val existing = customSeriesDao.getSeriesById(id) ?: return
+    val now = System.currentTimeMillis()
+    val cleanTitle = title.trim()
+    val cleanYear = year?.trim()?.takeIf { it.isNotBlank() }
+    val cleanPoster = posterPath?.trim()?.takeIf { it.isNotBlank() }
+
+    // Clean up old artwork if poster was changed or removed
+    if (existing.posterPath != null && existing.posterPath != cleanPoster) {
+      artworkStore.delete(listOf(existing.posterPath))
+    }
+
+    customSeriesDao.updateSeries(
+      existing.copy(
+        title = cleanTitle,
+        year = cleanYear,
+        posterPath = cleanPoster,
+        tmdbId = tmdbId ?: existing.tmdbId,
+        updatedAt = now,
+      )
+    )
+
+    val entities = items.mapIndexed { index, draft ->
+      CustomSeriesItemEntity(
+        seriesId = id,
+        filePath = draft.filePath,
+        fileName = draft.fileName,
+        season = draft.season.coerceAtLeast(0),
+        episode = draft.episode.coerceAtLeast(1),
+        position = index,
+      )
+    }
+    customSeriesDao.replaceSeriesItems(id, entities)
+  }
+
+  suspend fun deleteSeries(id: Int) {
+    val existing = customSeriesDao.getSeriesById(id) ?: return
+    if (!existing.posterPath.isNullOrBlank()) {
+      artworkStore.delete(listOf(existing.posterPath))
+    }
+    customSeriesDao.deleteSeries(existing)
+  }
+
+  suspend fun addVideosToSeries(seriesId: Int, videos: List<Video>) {
+    val existing = customSeriesDao.getSeriesById(seriesId) ?: return
+    val currentItems = customSeriesDao.getItemsForSeries(seriesId)
+    val maxPosition = currentItems.maxOfOrNull { it.position } ?: -1
+    val maxSeason = currentItems.maxOfOrNull { it.season } ?: 1
+    var nextEpisode = (currentItems.filter { it.season == maxSeason }.maxOfOrNull { it.episode } ?: 0) + 1
+
+    val newItems = videos.mapIndexed { index, video ->
+      val parsed = MediaInfoParser.parse(video.displayName)
+      val season = parsed.season ?: maxSeason
+      val episode = if (parsed.season != null && parsed.episode != null) {
+        parsed.episode
+      } else {
+        val ep = nextEpisode
+        nextEpisode++
+        ep
+      }
+
+      CustomSeriesItemEntity(
+        seriesId = seriesId,
+        filePath = video.path,
+        fileName = video.displayName,
+        season = season,
+        episode = episode,
+        position = maxPosition + 1 + index,
+      )
+    }
+
+    customSeriesDao.insertItems(newItems)
+    customSeriesDao.updateSeries(existing.copy(updatedAt = System.currentTimeMillis()))
+  }
+
+  suspend fun getSeriesById(id: Int): CustomSeriesEntity? = customSeriesDao.getSeriesById(id)
+
+  fun observeSeriesById(id: Int): Flow<CustomSeriesEntity?> = customSeriesDao.observeSeriesById(id)
+
+  suspend fun getAllSeries(): List<CustomSeriesEntity> = customSeriesDao.getAllSeries()
+
+  fun observeAllSeries(): Flow<List<CustomSeriesEntity>> = customSeriesDao.observeAllSeries()
+
+  suspend fun getItemsForSeries(seriesId: Int): List<CustomSeriesItemEntity> =
+    customSeriesDao.getItemsForSeries(seriesId)
+
+  fun observeItemsForSeries(seriesId: Int): Flow<List<CustomSeriesItemEntity>> =
+    customSeriesDao.observeItemsForSeries(seriesId)
+
+  suspend fun getAllItems(): List<CustomSeriesItemEntity> = customSeriesDao.getAllItems()
+
+  fun observeAllItems(): Flow<List<CustomSeriesItemEntity>> = customSeriesDao.observeAllItems()
+
+  suspend fun getAllClaimedFilePaths(): Set<String> =
+    customSeriesDao.getAllItems().mapTo(HashSet()) { it.filePath }
+}
diff --git a/app/src/main/java/app/aryan447/mpvium/di/DatabaseModule.kt b/app/src/main/java/app/aryan447/mpvium/di/DatabaseModule.kt
index 6ec9185b..7207d04a 100644
--- a/app/src/main/java/app/aryan447/mpvium/di/DatabaseModule.kt
+++ b/app/src/main/java/app/aryan447/mpvium/di/DatabaseModule.kt
@@ -489,6 +489,62 @@ val MIGRATION_8_9 = object : Migration(8, 9) {
   }
 }
 
+/**
+ * Migration from version 9 to version 10
+ *
+ * Changes:
+ * - Adds custom_series table for user-curated TV shows
+ * - Adds custom_series_item table with foreign key cascade to custom_series and indices
+ */
+val MIGRATION_9_10 = object : Migration(9, 10) {
+  override fun migrate(db: SupportSQLiteDatabase) {
+    try {
+      android.util.Log.d("Migration_9_10", "Starting migration from version 9 to 10")
+
+      db.execSQL(
+        """
+        CREATE TABLE IF NOT EXISTS `custom_series` (
+          `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+          `title` TEXT NOT NULL,
+          `year` TEXT,
+          `posterPath` TEXT,
+          `tmdbId` INTEGER,
+          `createdAt` INTEGER NOT NULL,
+          `updatedAt` INTEGER NOT NULL
+        )
+        """.trimIndent(),
+      )
+
+      db.execSQL(
+        """
+        CREATE TABLE IF NOT EXISTS `custom_series_item` (
+          `id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL,
+          `seriesId` INTEGER NOT NULL,
+          `filePath` TEXT NOT NULL,
+          `fileName` TEXT NOT NULL,
+          `season` INTEGER NOT NULL,
+          `episode` INTEGER NOT NULL,
+          `position` INTEGER NOT NULL,
+          FOREIGN KEY(`seriesId`) REFERENCES `custom_series`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE
+        )
+        """.trimIndent(),
+      )
+
+      db.execSQL(
+        "CREATE INDEX IF NOT EXISTS `index_custom_series_item_seriesId` ON `custom_series_item` (`seriesId`)"
+      )
+      db.execSQL(
+        "CREATE INDEX IF NOT EXISTS `index_custom_series_item_filePath` ON `custom_series_item` (`filePath`)"
+      )
+
+      android.util.Log.d("Migration_9_10", "Migration completed successfully")
+    } catch (e: Exception) {
+      android.util.Log.e("Migration_9_10", "Migration failed", e)
+      throw e
+    }
+  }
+}
+
 
 val DatabaseModule =
   module {
@@ -504,7 +560,7 @@ val DatabaseModule =
       Room
         .databaseBuilder(context, MpviumDatabase::class.java, "mpvium.db")
         .setJournalMode(RoomDatabase.JournalMode.WRITE_AHEAD_LOGGING)
-        .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9)
+        .addMigrations(MIGRATION_1_2, MIGRATION_2_3, MIGRATION_3_4, MIGRATION_4_5, MIGRATION_5_6, MIGRATION_6_7, MIGRATION_7_8, MIGRATION_8_9, MIGRATION_9_10)
         .fallbackToDestructiveMigration(true) // Fallback if migration fails (last resort)
         .build()
     }
@@ -545,4 +601,15 @@ val DatabaseModule =
     single {
       get<MpviumDatabase>().libraryIndexDao()
     }
+
+    single {
+      get<MpviumDatabase>().customSeriesDao()
+    }
+
+    single {
+      app.aryan447.mpvium.database.repository.CustomSeriesRepository(
+        customSeriesDao = get(),
+        artworkStore = get(),
+      )
+    }
   }
diff --git a/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt b/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
index f358246d..1b3a0144 100644
--- a/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
+++ b/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
@@ -185,6 +185,23 @@ class SeriesDetector(
     }
     val recentTimestampByFileName = recentPlayedList.associate { it.fileName to it.timestamp }
 
+    val customSeriesList = try {
+      database.customSeriesDao().getAllSeries()
+    } catch (e: Exception) {
+      Log.w(TAG, "Error fetching custom series", e)
+      emptyList()
+    }
+
+    val customSeriesItems = try {
+      database.customSeriesDao().getAllItems()
+    } catch (e: Exception) {
+      Log.w(TAG, "Error fetching custom series items", e)
+      emptyList()
+    }
+
+    val claimedPaths = customSeriesItems.mapTo(HashSet()) { it.filePath }
+    val scanItems = if (claimedPaths.isEmpty()) items else items.filter { (video, _) -> video.path !in claimedPaths }
+
     val rawSeriesMap = mutableMapOf<String, MutableList<Pair<LocalEpisode, Video>>>()
     val seriesTitleById = mutableMapOf<String, String>()
     val seriesYearById = mutableMapOf<String, String?>()
@@ -198,7 +215,7 @@ class SeriesDetector(
     // episode numbers in Season 1.
     val explicitSeasonByFolder = mutableMapOf<String, Int>()
     val explicitEpisodeRegex = Regex("""[Ss](\d{1,2})[\s._-]*[Ee]|\b(\d{1,2})[xX]\d{1,4}\b""")
-    for ((video, _) in items) {
+    for ((video, _) in scanItems) {
       val parentPath = try { File(video.path).parent ?: "" } catch (_: Exception) { "" }
       if (parentPath.isBlank()) continue
       val match = explicitEpisodeRegex.find(video.displayName)
@@ -210,7 +227,7 @@ class SeriesDetector(
       }
     }
 
-    for ((video, parsed) in items) {
+    for ((video, parsed) in scanItems) {
       val playbackState = playbackStates[video.displayName] ?: playbackStates[video.title]
         val positionMs = (playbackState?.lastPosition ?: 0) * 1000L
         val durationMs = video.duration
@@ -451,11 +468,133 @@ class SeriesDetector(
         )
       }.sortedByDescending { it.totalEpisodes }
 
+      // Build custom series overlays (deterministic id: "custom:<id>")
+      val videoByPath = items.associate { it.first.path to it.first }
+      val videoByName = items.associate { it.first.displayName to it.first }
+
+      val customSeriesBuiltList = customSeriesList.mapNotNull { customSeries ->
+        val seriesItems = customSeriesItems
+          .filter { it.seriesId == customSeries.id }
+          .sortedBy { it.position }
+        if (seriesItems.isEmpty()) return@mapNotNull null
+
+        val customEpisodes = seriesItems.mapIndexed { idx, item ->
+          val video = videoByPath[item.filePath]
+            ?: videoByName[item.fileName]
+            ?: Video(
+              id = (customSeries.id * 100_000L + idx),
+              title = item.fileName,
+              path = item.filePath,
+              duration = 0L,
+              size = 0L,
+              dateAdded = customSeries.createdAt,
+              dateModified = customSeries.createdAt,
+              displayName = item.fileName,
+            )
+
+          val playbackState = playbackStates[video.displayName] ?: playbackStates[video.title]
+          val positionMs = (playbackState?.lastPosition ?: 0) * 1000L
+          val durationMs = video.duration
+          val progress = if (durationMs > 0) (positionMs.toFloat() / durationMs).coerceIn(0f, 1f) else 0f
+          val isWatched = (playbackState?.hasBeenWatched == true) || (progress >= watchedThreshold)
+
+          LocalEpisode(
+            video = video,
+            seasonNumber = item.season,
+            episodeNumber = item.episode,
+            episodeTitle = null,
+            stillUrl = null,
+            overview = null,
+            rating = null,
+            playbackPositionMs = positionMs,
+            isWatched = isWatched,
+            progressPercentage = progress,
+          )
+        }
+
+        val seasonsMap = customEpisodes
+          .groupBy { it.seasonNumber }
+          .mapValues { (_, eps) ->
+            eps.sortedWith(compareBy({ it.seasonNumber }, { it.episodeNumber }, { it.video.displayName }))
+          }
+          .toSortedMap()
+
+        val allEpisodes = seasonsMap.values.flatten()
+        val totalEpisodes = allEpisodes.size
+        val totalDuration = allEpisodes.sumOf { it.video.duration }
+        val watchedCount = allEpisodes.count { it.isWatched }
+
+        val lastWatched = allEpisodes
+          .filter { it.playbackPositionMs > 0 }
+          .maxByOrNull { episode ->
+            recentTimestampByFileName[episode.video.displayName] ?: episode.video.dateModified
+          }
+
+        val nextToWatch = if (lastWatched != null) {
+          if (!lastWatched.isWatched) {
+            lastWatched
+          } else {
+            val currentIndex = allEpisodes.indexOf(lastWatched)
+            if (currentIndex in 0 until allEpisodes.size - 1) {
+              allEpisodes[currentIndex + 1]
+            } else {
+              lastWatched
+            }
+          }
+        } else {
+          allEpisodes.firstOrNull()
+        }
+
+        val deterministicId = "custom:${customSeries.id}"
+
+        // In-progress continue watching
+        if (lastWatched != null && lastWatched.playbackPositionMs > 10_000L && !lastWatched.isWatched && lastWatched.progressPercentage < watchedThreshold) {
+          val remainingMins = (lastWatched.video.duration - lastWatched.playbackPositionMs) / (1000 * 60)
+          val episodeTag = lastWatched.formattedEpisodeTag
+          val subtitleText = if (remainingMins > 0) "$episodeTag • ${remainingMins}m remaining" else episodeTag
+
+          continueWatchingList.add(
+            ContinueWatchingItem(
+              video = lastWatched.video,
+              title = customSeries.title,
+              subtitle = subtitleText,
+              playbackPositionMs = lastWatched.playbackPositionMs,
+              totalDurationMs = lastWatched.video.duration,
+              progressPercentage = lastWatched.progressPercentage,
+              lastPlayedTimestamp = recentTimestampByFileName[lastWatched.video.displayName]
+                ?: lastWatched.video.dateModified * 1000,
+              isSeries = true,
+              seriesId = deterministicId,
+            )
+          )
+        }
+
+        LocalSeries(
+          id = deterministicId,
+          title = customSeries.title,
+          year = customSeries.year,
+          posterUrl = customSeries.posterPath,
+          backdropUrl = null,
+          rating = null,
+          overview = null,
+          genres = emptyList(),
+          tmdbId = customSeries.tmdbId,
+          totalEpisodes = totalEpisodes,
+          totalDurationMs = totalDuration,
+          watchedEpisodesCount = watchedCount,
+          lastWatchedEpisode = lastWatched,
+          nextEpisodeToWatch = nextToWatch,
+          seasons = seasonsMap,
+        )
+      }
+
+      val allSeries = customSeriesBuiltList + detectedSeriesList
+
       // Keep a series in Continue Watching while unwatched episodes remain.
       // Without this, deleting (or finishing) the in-progress episode drops
       // the whole series even though the next episode is still waiting.
       val videosAlreadyListed = continueWatchingList.map { it.video.path }.toSet()
-      for (series in detectedSeriesList) {
+      for (series in allSeries) {
         val lastWatched = series.lastWatchedEpisode ?: continue
         val next = series.nextEpisodeToWatch ?: continue
         if (next.isWatched) continue
@@ -486,7 +625,7 @@ class SeriesDetector(
       val sortedContinueWatching = visibleContinueWatching.sortedByDescending { it.lastPlayedTimestamp }
 
       DetectedMediaLibrary(
-        series = detectedSeriesList,
+        series = allSeries,
         movies = detectedMovies.sortedBy { it.title.lowercase(Locale.getDefault()) },
         continueWatching = sortedContinueWatching,
         folders = folders,
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/browser/components/BrowserTopBar.kt b/app/src/main/java/app/aryan447/mpvium/ui/browser/components/BrowserTopBar.kt
index e87b7579..9c539d6c 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/browser/components/BrowserTopBar.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/browser/components/BrowserTopBar.kt
@@ -24,6 +24,7 @@ import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.Share
 import androidx.compose.material.icons.filled.SortByAlpha
+import androidx.compose.material.icons.filled.Tv
 import androidx.compose.material.icons.filled.ViewComfy
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.DropdownMenu
@@ -102,6 +103,7 @@ fun BrowserTopBar(
   onTitleLongPress: (() -> Unit)? = null,
   useRemoveIcon: Boolean = false,
   onAddToPlaylistClick: (() -> Unit)? = null,
+  onAddToSeriesClick: (() -> Unit)? = null,
   onMarkAsClick: (() -> Unit)? = null,
   scrolled: Boolean = true,
   mediaLayoutMode: app.aryan447.mpvium.preferences.MediaLayoutMode? = null,
@@ -125,6 +127,7 @@ fun BrowserTopBar(
       modifier = modifier,
       useRemoveIcon = useRemoveIcon,
       onAddToPlaylist = onAddToPlaylistClick,
+      onAddToSeries = onAddToSeriesClick,
       onMarkAs = onMarkAsClick,
     )
   } else {
@@ -356,6 +359,7 @@ private fun SelectionTopBar(
   modifier: Modifier = Modifier,
   useRemoveIcon: Boolean = false,
   onAddToPlaylist: (() -> Unit)? = null,
+  onAddToSeries: (() -> Unit)? = null,
   onMarkAs: (() -> Unit)? = null,
 ) {
   var showDropdown by remember { mutableStateOf(false) }
@@ -468,6 +472,20 @@ private fun SelectionTopBar(
         }
       }
 
+      if (onAddToSeries != null) {
+        IconButton(
+          onClick = onAddToSeries,
+          modifier = Modifier.padding(horizontal = 2.dp),
+        ) {
+          Icon(
+            Icons.Filled.Tv,
+            contentDescription = stringResource(R.string.add_to_series),
+            modifier = Modifier.size(24.dp),
+            tint = MaterialTheme.colorScheme.secondary,
+          )
+        }
+      }
+
       // Mark as (manual watch status) icon
       if (onMarkAs != null) {
         IconButton(
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/browser/components/FloatingBottomBar.kt b/app/src/main/java/app/aryan447/mpvium/ui/browser/components/FloatingBottomBar.kt
index 425659f4..6d229d85 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/browser/components/FloatingBottomBar.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/browser/components/FloatingBottomBar.kt
@@ -18,6 +18,7 @@ import androidx.compose.material.icons.automirrored.filled.PlaylistAdd
 import androidx.compose.material.icons.filled.ContentCopy
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.DriveFileRenameOutline
+import androidx.compose.material.icons.filled.Tv
 import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
 import androidx.compose.material3.FilledTonalIconButton
 import androidx.compose.material3.Icon
@@ -64,6 +65,8 @@ fun BrowserBottomBar(
   showRename: Boolean = true,
   showDelete: Boolean = true,
   showAddToPlaylist: Boolean = true,
+  onAddToSeriesClick: (() -> Unit)? = null,
+  showAddToSeries: Boolean = true,
   hazeState: HazeState? = null,
   hazeStyle: HazeStyle? = null,
 ) {
@@ -184,6 +187,28 @@ fun BrowserBottomBar(
           )
         }
 
+        if (onAddToSeriesClick != null) {
+          FilledTonalIconButton(
+            onClick = onAddToSeriesClick,
+            enabled = showAddToSeries,
+            modifier = Modifier.size(50.dp).glassSheen(CircleShape, isGlass),
+            colors = IconButtonDefaults.filledTonalIconButtonColors(
+              containerColor = glassButtonContainerColor(
+                MaterialTheme.colorScheme.secondaryContainer,
+              ),
+              contentColor = glassButtonContentColor(
+                MaterialTheme.colorScheme.onSecondaryContainer,
+              ),
+            )
+          ) {
+            Icon(
+              Icons.Filled.Tv,
+              contentDescription = "Add to series",
+              modifier = Modifier.size(24.dp)
+            )
+          }
+        }
+
         FilledTonalIconButton(
           onClick = onDeleteClick,
           enabled = showDelete,
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/browser/dialogs/AddToSeriesDialog.kt b/app/src/main/java/app/aryan447/mpvium/ui/browser/dialogs/AddToSeriesDialog.kt
new file mode 100644
index 00000000..8c86417f
--- /dev/null
+++ b/app/src/main/java/app/aryan447/mpvium/ui/browser/dialogs/AddToSeriesDialog.kt
@@ -0,0 +1,195 @@
+package app.aryan447.mpvium.ui.browser.dialogs
+
+import android.widget.Toast
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Tv
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import app.aryan447.mpvium.R
+import app.aryan447.mpvium.database.repository.CustomSeriesRepository
+import app.aryan447.mpvium.domain.media.model.Video
+import app.aryan447.mpvium.ui.theme.glassSheetContainerColor
+import app.aryan447.mpvium.utils.media.MediaLibraryEvents
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.koin.compose.koinInject
+
+@Composable
+fun AddToSeriesDialog(
+  isOpen: Boolean,
+  videos: List<Video>,
+  onDismiss: () -> Unit,
+  onCreateNewSeries: () -> Unit,
+  onSuccess: () -> Unit,
+  modifier: Modifier = Modifier,
+) {
+  if (!isOpen) return
+
+  val context = LocalContext.current
+  val customSeriesRepository = koinInject<CustomSeriesRepository>()
+  val seriesListFromDb by customSeriesRepository.observeAllSeries().collectAsState(initial = emptyList())
+  val seriesList = remember(seriesListFromDb) {
+    seriesListFromDb.sortedBy { it.title.lowercase() }
+  }
+  val coroutineScope = rememberCoroutineScope()
+
+  AlertDialog(
+    onDismissRequest = onDismiss,
+    modifier = modifier,
+    containerColor = glassSheetContainerColor(MaterialTheme.colorScheme.surface),
+    title = {
+      Text(
+        text = stringResource(R.string.custom_series_choose_series),
+        style = MaterialTheme.typography.headlineSmall,
+        fontWeight = FontWeight.Bold,
+      )
+    },
+    text = {
+      Column(
+        modifier = Modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+      ) {
+        Text(
+          text = if (videos.size == 1) {
+            "Add \"${videos.first().displayName}\" to a custom TV series"
+          } else {
+            "Add ${videos.size} videos to a custom TV series"
+          },
+          style = MaterialTheme.typography.bodyMedium,
+          color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+
+        // Create new series button
+        OutlinedButton(
+          onClick = {
+            onDismiss()
+            onCreateNewSeries()
+          },
+          modifier = Modifier.fillMaxWidth(),
+          shape = RoundedCornerShape(12.dp),
+        ) {
+          Icon(
+            imageVector = Icons.Filled.Add,
+            contentDescription = null,
+            modifier = Modifier.size(20.dp),
+          )
+          Spacer(modifier = Modifier.width(8.dp))
+          Text(
+            text = stringResource(R.string.custom_series_create_new),
+            fontWeight = FontWeight.Medium,
+          )
+        }
+
+        if (seriesList.isNotEmpty()) {
+          Text(
+            text = "Existing custom series",
+            style = MaterialTheme.typography.labelMedium,
+            color = MaterialTheme.colorScheme.primary,
+            fontWeight = FontWeight.SemiBold,
+          )
+
+          LazyColumn(
+            modifier = Modifier
+              .fillMaxWidth()
+              .heightIn(max = 240.dp),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+          ) {
+            items(seriesList, key = { it.id }) { series ->
+              Card(
+                modifier = Modifier
+                  .fillMaxWidth()
+                  .clickable {
+                    coroutineScope.launch {
+                      withContext(Dispatchers.IO) {
+                        customSeriesRepository.addVideosToSeries(series.id, videos)
+                        MediaLibraryEvents.notifyChanged()
+                      }
+                      val msg = context.getString(R.string.custom_series_added_to, series.title)
+                      Toast.makeText(context, msg, Toast.LENGTH_SHORT).show()
+                      onSuccess()
+                      onDismiss()
+                    }
+                  },
+                shape = RoundedCornerShape(12.dp),
+                colors = CardDefaults.cardColors(
+                  containerColor = MaterialTheme.colorScheme.surfaceContainerHigh,
+                ),
+              ) {
+                Row(
+                  modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(12.dp),
+                  verticalAlignment = Alignment.CenterVertically,
+                ) {
+                  Icon(
+                    imageVector = Icons.Filled.Tv,
+                    contentDescription = null,
+                    modifier = Modifier.size(24.dp),
+                    tint = MaterialTheme.colorScheme.primary,
+                  )
+                  Spacer(modifier = Modifier.width(12.dp))
+                  Column(modifier = Modifier.weight(1f)) {
+                    Text(
+                      text = series.title,
+                      style = MaterialTheme.typography.bodyMedium,
+                      fontWeight = FontWeight.Medium,
+                      maxLines = 1,
+                      overflow = TextOverflow.Ellipsis,
+                    )
+                    if (!series.year.isNullOrBlank()) {
+                      Text(
+                        text = series.year,
+                        style = MaterialTheme.typography.bodySmall,
+                        color = MaterialTheme.colorScheme.onSurfaceVariant,
+                      )
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    },
+    confirmButton = {},
+    dismissButton = {
+      TextButton(onClick = onDismiss) {
+        Text(stringResource(R.string.generic_cancel))
+      }
+    },
+  )
+}
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/browser/filesystem/FileSystemBrowserScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/browser/filesystem/FileSystemBrowserScreen.kt
index 80d6cf92..4c681d74 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/browser/filesystem/FileSystemBrowserScreen.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/browser/filesystem/FileSystemBrowserScreen.kt
@@ -108,6 +108,8 @@ import app.aryan447.mpvium.ui.browser.cards.VideoCard
 import app.aryan447.mpvium.ui.browser.components.BrowserBottomBar
 import app.aryan447.mpvium.ui.browser.components.BrowserTopBar
 import app.aryan447.mpvium.ui.browser.dialogs.AddToPlaylistDialog
+import app.aryan447.mpvium.ui.browser.dialogs.AddToSeriesDialog
+import app.aryan447.mpvium.ui.streaming.series.CustomSeriesBuilderScreen
 import app.aryan447.mpvium.ui.browser.dialogs.DeleteConfirmationDialog
 import app.aryan447.mpvium.ui.browser.dialogs.FileOperationProgressDialog
 import app.aryan447.mpvium.ui.browser.dialogs.FolderPickerDialog
@@ -212,6 +214,7 @@ fun FileSystemBrowserScreen(path: String? = null) {
   val deleteDialogOpen = rememberSaveable { mutableStateOf(false) }
   val renameDialogOpen = rememberSaveable { mutableStateOf(false) }
   val addToPlaylistDialogOpen = rememberSaveable { mutableStateOf(false) }
+  val addToSeriesDialogOpen = rememberSaveable { mutableStateOf(false) }
   val markAsDialogOpen = rememberSaveable { mutableStateOf(false) }
 
   // FAB visibility for scroll-based hiding
@@ -721,6 +724,9 @@ fun FileSystemBrowserScreen(path: String? = null) {
             onAddToPlaylistClick = if (!BuildConfig.ENABLE_UPDATE_FEATURE && videoSelectionManager.isInSelectionMode && !folderSelectionManager.isInSelectionMode) {
               { addToPlaylistDialogOpen.value = true }
             } else null,
+            onAddToSeriesClick = if (videoSelectionManager.isInSelectionMode && !folderSelectionManager.isInSelectionMode) {
+              { addToSeriesDialogOpen.value = true }
+            } else null,
             onMarkAsClick = if (videoSelectionManager.isInSelectionMode && !folderSelectionManager.isInSelectionMode) {
               { markAsDialogOpen.value = true }
             } else null,
@@ -966,6 +972,8 @@ fun FileSystemBrowserScreen(path: String? = null) {
         onRenameClick = { renameDialogOpen.value = true },
         onDeleteClick = { deleteDialogOpen.value = true },
         onAddToPlaylistClick = { addToPlaylistDialogOpen.value = true },
+        onAddToSeriesClick = { addToSeriesDialogOpen.value = true },
+        showAddToSeries = videoSelectionManager.isInSelectionMode && !folderSelectionManager.isInSelectionMode,
         showRename = videoSelectionManager.isSingleSelection,
         hazeState = bottomBarHaze,
         hazeStyle = bottomBarHazeStyle,
@@ -1086,6 +1094,22 @@ fun FileSystemBrowserScreen(path: String? = null) {
       },
     )
 
+    // Add to Series Dialog
+    AddToSeriesDialog(
+      isOpen = addToSeriesDialogOpen.value,
+      videos = videoSelectionManager.getSelectedItems(),
+      onDismiss = { addToSeriesDialogOpen.value = false },
+      onCreateNewSeries = {
+        val selected = videoSelectionManager.getSelectedItems()
+        videoSelectionManager.clear()
+        backstack.add(CustomSeriesBuilderScreen(initialVideos = selected))
+      },
+      onSuccess = {
+        videoSelectionManager.clear()
+        viewModel.refresh()
+      },
+    )
+
     // Mark as (manual watch status) Dialog
     MarkAsDialog(
       isOpen = markAsDialogOpen.value,
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/browser/videolist/VideoListScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/browser/videolist/VideoListScreen.kt
index 482ec9da..14c38db3 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/browser/videolist/VideoListScreen.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/browser/videolist/VideoListScreen.kt
@@ -95,6 +95,8 @@ import app.aryan447.mpvium.ui.browser.cards.VideoCard
 import app.aryan447.mpvium.ui.browser.components.BrowserBottomBar
 import app.aryan447.mpvium.ui.browser.components.BrowserTopBar
 import app.aryan447.mpvium.ui.browser.dialogs.AddToPlaylistDialog
+import app.aryan447.mpvium.ui.browser.dialogs.AddToSeriesDialog
+import app.aryan447.mpvium.ui.streaming.series.CustomSeriesBuilderScreen
 import app.aryan447.mpvium.ui.browser.dialogs.DeleteConfirmationDialog
 import app.aryan447.mpvium.ui.browser.dialogs.FileOperationProgressDialog
 import app.aryan447.mpvium.ui.browser.dialogs.FolderPickerDialog
@@ -192,6 +194,7 @@ data class VideoListScreen(
     val deleteDialogOpen = rememberSaveable { mutableStateOf(false) }
     val renameDialogOpen = rememberSaveable { mutableStateOf(false) }
     val addToPlaylistDialogOpen = rememberSaveable { mutableStateOf(false) }
+    val addToSeriesDialogOpen = rememberSaveable { mutableStateOf(false) }
     val markAsDialogOpen = rememberSaveable { mutableStateOf(false) }
 
     // Copy/Move state
@@ -319,6 +322,7 @@ data class VideoListScreen(
           onAddToPlaylistClick = if (!BuildConfig.ENABLE_UPDATE_FEATURE) {
             { addToPlaylistDialogOpen.value = true }
           } else null,
+          onAddToSeriesClick = { addToSeriesDialogOpen.value = true },
           onMarkAsClick = { markAsDialogOpen.value = true },
         )
       },
@@ -438,6 +442,7 @@ data class VideoListScreen(
             onRenameClick = { renameDialogOpen.value = true },
             onDeleteClick = { deleteDialogOpen.value = true },
             onAddToPlaylistClick = { addToPlaylistDialogOpen.value = true },
+            onAddToSeriesClick = { addToSeriesDialogOpen.value = true },
             showRename = selectionManager.isSingleSelection,
             hazeState = bottomBarHaze,
             hazeStyle = bottomBarHazeStyle,
@@ -582,6 +587,22 @@ data class VideoListScreen(
         },
       )
 
+      // Add to Series Dialog
+      AddToSeriesDialog(
+        isOpen = addToSeriesDialogOpen.value,
+        videos = selectionManager.getSelectedItems(),
+        onDismiss = { addToSeriesDialogOpen.value = false },
+        onCreateNewSeries = {
+          val selected = selectionManager.getSelectedItems()
+          selectionManager.clear()
+          backstack.add(CustomSeriesBuilderScreen(initialVideos = selected))
+        },
+        onSuccess = {
+          selectionManager.clear()
+          viewModel.refresh()
+        },
+      )
+
       // Mark as (manual watch status) Dialog
       MarkAsDialog(
         isOpen = markAsDialogOpen.value,
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt
new file mode 100644
index 00000000..056a9ea9
--- /dev/null
+++ b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt
@@ -0,0 +1,923 @@
+package app.aryan447.mpvium.ui.streaming.series
+
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.net.Uri
+import android.widget.Toast
+import androidx.activity.compose.BackHandler
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.PickVisualMediaRequest
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.foundation.Image
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.statusBarsPadding
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.itemsIndexed
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.AddPhotoAlternate
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.DeleteOutline
+import androidx.compose.material.icons.filled.DragHandle
+import androidx.compose.material.icons.filled.Movie
+import androidx.compose.material.icons.filled.Search
+import androidx.compose.material.icons.filled.Tv
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.AssistChip
+import androidx.compose.material3.AssistChipDefaults
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedButton
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.TopAppBarDefaults
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.draw.shadow
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import app.aryan447.mpvium.R
+import app.aryan447.mpvium.database.repository.CustomSeriesItemDraft
+import app.aryan447.mpvium.database.repository.CustomSeriesRepository
+import app.aryan447.mpvium.domain.media.model.Video
+import app.aryan447.mpvium.domain.streaming.LibraryIndexRepository
+import app.aryan447.mpvium.domain.streaming.StreamingArtworkStore
+import app.aryan447.mpvium.ui.theme.glassSheetContainerColor
+import app.aryan447.mpvium.ui.utils.LocalBackStack
+import app.aryan447.mpvium.utils.media.MediaInfoParser
+import app.aryan447.mpvium.utils.media.MediaLibraryEvents
+import cafe.adriel.voyager.core.screen.Screen
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.Transient
+import org.koin.compose.koinInject
+import sh.calvin.reorderable.ReorderableItem
+import sh.calvin.reorderable.rememberReorderableLazyListState
+import java.io.File
+
+@Serializable
+data class CustomSeriesBuilderScreen(
+  val seriesId: Int? = null,
+  @Transient val initialVideos: List<Video> = emptyList(),
+) : Screen {
+
+  @OptIn(ExperimentalMaterial3Api::class)
+  @Composable
+  override fun Content() {
+    val context = LocalContext.current
+    val backstack = LocalBackStack.current
+    val customSeriesRepository = koinInject<CustomSeriesRepository>()
+    val artworkStore = koinInject<StreamingArtworkStore>()
+    val libraryIndexRepository = koinInject<LibraryIndexRepository>()
+    val coroutineScope = rememberCoroutineScope()
+
+    var title by remember { mutableStateOf("") }
+    var year by remember { mutableStateOf("") }
+    var posterPath by remember { mutableStateOf<String?>(null) }
+    var selectedPosterUri by remember { mutableStateOf<Uri?>(null) }
+    var removePoster by remember { mutableStateOf(false) }
+    var previewBitmap by remember { mutableStateOf<Bitmap?>(null) }
+    var episodes by remember { mutableStateOf<List<CustomSeriesItemDraft>>(emptyList()) }
+    var isLoading by remember { mutableStateOf(seriesId != null) }
+    var isSaving by remember { mutableStateOf(false) }
+
+    var editingEpisodeItem by remember { mutableStateOf<Pair<Int, CustomSeriesItemDraft>?>(null) }
+    var showAddEpisodesSheet by remember { mutableStateOf(false) }
+    var showDiscardDialog by remember { mutableStateOf(false) }
+
+    val photoPickerLauncher = rememberLauncherForActivityResult(
+      contract = ActivityResultContracts.PickVisualMedia(),
+    ) { uri ->
+      if (uri != null) {
+        selectedPosterUri = uri
+        removePoster = false
+      }
+    }
+
+    // Load initial data
+    LaunchedEffect(seriesId) {
+      if (seriesId != null) {
+        withContext(Dispatchers.IO) {
+          val series = customSeriesRepository.getSeriesById(seriesId)
+          val items = customSeriesRepository.getItemsForSeries(seriesId)
+          if (series != null) {
+            title = series.title
+            year = series.year.orEmpty()
+            posterPath = series.posterPath
+            episodes = items.map {
+              CustomSeriesItemDraft(
+                id = it.id,
+                filePath = it.filePath,
+                fileName = it.fileName,
+                season = it.season,
+                episode = it.episode,
+                position = it.position,
+              )
+            }
+
+            if (!series.posterPath.isNullOrBlank()) {
+              val bitmap = artworkStore.loadImage(series.posterPath)
+                ?: runCatching { BitmapFactory.decodeFile(series.posterPath) }.getOrNull()
+              previewBitmap = bitmap
+            }
+          }
+          isLoading = false
+        }
+      } else if (initialVideos.isNotEmpty()) {
+        val drafts = initialVideos.mapIndexed { index, video ->
+          val parsed = MediaInfoParser.parse(video.displayName)
+          CustomSeriesItemDraft(
+            filePath = video.path,
+            fileName = video.displayName,
+            season = parsed.season ?: 1,
+            episode = parsed.episode ?: (index + 1),
+            position = index,
+          )
+        }
+        episodes = drafts
+        val firstParsed = MediaInfoParser.parse(initialVideos.first().displayName)
+        title = firstParsed.title.ifBlank { "" }
+        year = firstParsed.year.orEmpty()
+        isLoading = false
+      } else {
+        isLoading = false
+      }
+    }
+
+    // Load selected image preview
+    LaunchedEffect(selectedPosterUri) {
+      val uri = selectedPosterUri
+      if (uri != null) {
+        val bitmap = withContext(Dispatchers.IO) {
+          runCatching {
+            context.contentResolver.openInputStream(uri)?.use { stream ->
+              BitmapFactory.decodeStream(stream)
+            }
+          }.getOrNull()
+        }
+        previewBitmap = bitmap
+      }
+    }
+
+    val hasUnsavedChanges = remember(title, year, selectedPosterUri, removePoster, episodes) {
+      title.isNotBlank() || episodes.isNotEmpty() || selectedPosterUri != null
+    }
+
+    val onBack = {
+      if (hasUnsavedChanges && !isSaving) {
+        showDiscardDialog = true
+      } else if (backstack.size > 1) {
+        backstack.removeLastOrNull()
+      } else {
+        (context as? android.app.Activity)?.finish()
+      }
+    }
+
+    BackHandler(onBack = { onBack() })
+
+    val listState = rememberLazyListState()
+    val reorderableState = rememberReorderableLazyListState(listState) { from, to ->
+      // Exclude header items from drag indices
+      val fromEpIndex = from.index - 1
+      val toEpIndex = to.index - 1
+      if (fromEpIndex in episodes.indices && toEpIndex in episodes.indices) {
+        val updated = episodes.toMutableList()
+        val item = updated.removeAt(fromEpIndex)
+        updated.add(toEpIndex, item)
+        episodes = updated.mapIndexed { idx, draft -> draft.copy(position = idx) }
+      }
+    }
+
+    Scaffold(
+      topBar = {
+        TopAppBar(
+          title = {
+            Text(
+              text = if (seriesId != null) stringResource(R.string.edit_series) else stringResource(R.string.new_series),
+              style = MaterialTheme.typography.titleLarge.copy(fontWeight = FontWeight.Bold),
+            )
+          },
+          navigationIcon = {
+            IconButton(onClick = { onBack() }) {
+              Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = stringResource(R.string.generic_cancel))
+            }
+          },
+          actions = {
+            Button(
+              onClick = {
+                if (title.isBlank()) return@Button
+                isSaving = true
+                coroutineScope.launch {
+                  val finalPoster = withContext(Dispatchers.IO) {
+                    when {
+                      selectedPosterUri != null -> {
+                        artworkStore.storeCustomArtwork(selectedPosterUri!!, keyHint = title)
+                      }
+                      removePoster -> null
+                      else -> posterPath
+                    }
+                  }
+
+                  withContext(Dispatchers.IO) {
+                    if (seriesId == null) {
+                      customSeriesRepository.createSeries(
+                        title = title,
+                        year = year.ifBlank { null },
+                        posterPath = finalPoster,
+                        items = episodes,
+                      )
+                    } else {
+                      customSeriesRepository.updateSeries(
+                        id = seriesId,
+                        title = title,
+                        year = year.ifBlank { null },
+                        posterPath = finalPoster,
+                        items = episodes,
+                      )
+                    }
+                    MediaLibraryEvents.notifyChanged()
+                  }
+
+                  Toast.makeText(context, context.getString(R.string.custom_series_saved), Toast.LENGTH_SHORT).show()
+                  if (backstack.size > 1) {
+                    backstack.removeLastOrNull()
+                  } else {
+                    (context as? android.app.Activity)?.finish()
+                  }
+                }
+              },
+              enabled = title.isNotBlank() && episodes.isNotEmpty() && !isSaving,
+              shape = RoundedCornerShape(20.dp),
+              modifier = Modifier.padding(end = 8.dp),
+            ) {
+              if (isSaving) {
+                CircularProgressIndicator(
+                  modifier = Modifier.size(18.dp),
+                  strokeWidth = 2.dp,
+                  color = MaterialTheme.colorScheme.onPrimary,
+                )
+              } else {
+                Icon(Icons.Filled.Check, contentDescription = null, modifier = Modifier.size(18.dp))
+                Spacer(modifier = Modifier.width(6.dp))
+                Text(stringResource(R.string.metadata_save))
+              }
+            }
+          },
+          colors = TopAppBarDefaults.topAppBarColors(containerColor = MaterialTheme.colorScheme.surface),
+        )
+      },
+      floatingActionButton = {
+        FloatingActionButton(
+          onClick = { showAddEpisodesSheet = true },
+          shape = CircleShape,
+          containerColor = MaterialTheme.colorScheme.primaryContainer,
+          contentColor = MaterialTheme.colorScheme.onPrimaryContainer,
+        ) {
+          Row(
+            modifier = Modifier.padding(horizontal = 16.dp),
+            verticalAlignment = Alignment.CenterVertically,
+          ) {
+            Icon(Icons.Filled.Add, contentDescription = stringResource(R.string.custom_series_add_episodes))
+            Spacer(modifier = Modifier.width(8.dp))
+            Text(stringResource(R.string.custom_series_add_episodes), fontWeight = FontWeight.SemiBold)
+          }
+        }
+      },
+    ) { innerPadding ->
+      if (isLoading) {
+        Box(
+          modifier = Modifier
+            .fillMaxSize()
+            .padding(innerPadding),
+          contentAlignment = Alignment.Center,
+        ) {
+          CircularProgressIndicator()
+        }
+        return@Scaffold
+      }
+
+      LazyColumn(
+        state = listState,
+        modifier = Modifier
+          .fillMaxSize()
+          .padding(innerPadding)
+          .imePadding(),
+        contentPadding = PaddingValues(bottom = 96.dp),
+      ) {
+        // Form Header
+        item(key = "header_section") {
+          Column(
+            modifier = Modifier
+              .fillMaxWidth()
+              .padding(horizontal = 16.dp, vertical = 12.dp),
+          ) {
+            Row(
+              modifier = Modifier.fillMaxWidth(),
+              horizontalArrangement = Arrangement.spacedBy(16.dp),
+              verticalAlignment = Alignment.Top,
+            ) {
+              // Poster Picker Card
+              Box(
+                modifier = Modifier
+                  .width(110.dp)
+                  .height(160.dp)
+                  .clip(RoundedCornerShape(12.dp))
+                  .background(MaterialTheme.colorScheme.surfaceContainerHigh)
+                  .border(
+                    width = 1.dp,
+                    color = MaterialTheme.colorScheme.outlineVariant,
+                    shape = RoundedCornerShape(12.dp),
+                  )
+                  .clickable {
+                    photoPickerLauncher.launch(
+                      PickVisualMediaRequest(ActivityResultContracts.PickVisualMedia.ImageOnly),
+                    )
+                  },
+                contentAlignment = Alignment.Center,
+              ) {
+                if (previewBitmap != null && !removePoster) {
+                  Image(
+                    bitmap = previewBitmap!!.asImageBitmap(),
+                    contentDescription = stringResource(R.string.metadata_field_poster),
+                    contentScale = ContentScale.Crop,
+                    modifier = Modifier.fillMaxSize(),
+                  )
+                  IconButton(
+                    onClick = {
+                      removePoster = true
+                      selectedPosterUri = null
+                      previewBitmap = null
+                      posterPath = null
+                    },
+                    modifier = Modifier
+                      .align(Alignment.TopEnd)
+                      .padding(4.dp)
+                      .size(28.dp)
+                      .clip(CircleShape)
+                      .background(Color.Black.copy(alpha = 0.6f)),
+                  ) {
+                    Icon(
+                      Icons.Filled.Close,
+                      contentDescription = stringResource(R.string.metadata_remove_poster),
+                      tint = Color.White,
+                      modifier = Modifier.size(16.dp),
+                    )
+                  }
+                } else {
+                  Column(
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                    verticalArrangement = Arrangement.spacedBy(6.dp),
+                    modifier = Modifier.padding(8.dp),
+                  ) {
+                    Icon(
+                      Icons.Filled.AddPhotoAlternate,
+                      contentDescription = stringResource(R.string.custom_series_pick_poster),
+                      tint = MaterialTheme.colorScheme.primary,
+                      modifier = Modifier.size(32.dp),
+                    )
+                    Text(
+                      text = stringResource(R.string.custom_series_pick_poster),
+                      style = MaterialTheme.typography.labelSmall,
+                      color = MaterialTheme.colorScheme.onSurfaceVariant,
+                      fontWeight = FontWeight.Medium,
+                    )
+                  }
+                }
+              }
+
+              // Name & Year Inputs
+              Column(
+                modifier = Modifier.weight(1f),
+                verticalArrangement = Arrangement.spacedBy(12.dp),
+              ) {
+                OutlinedTextField(
+                  value = title,
+                  onValueChange = { title = it },
+                  label = { Text(stringResource(R.string.metadata_field_title)) },
+                  singleLine = true,
+                  modifier = Modifier.fillMaxWidth(),
+                  shape = RoundedCornerShape(12.dp),
+                )
+
+                OutlinedTextField(
+                  value = year,
+                  onValueChange = { input ->
+                    year = input.filter { it.isDigit() }.take(4)
+                  },
+                  label = { Text(stringResource(R.string.metadata_field_year)) },
+                  singleLine = true,
+                  keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+                  modifier = Modifier.fillMaxWidth(),
+                  shape = RoundedCornerShape(12.dp),
+                )
+              }
+            }
+
+            Spacer(modifier = Modifier.height(20.dp))
+
+            // Episodes Section Header
+            Row(
+              modifier = Modifier.fillMaxWidth(),
+              horizontalArrangement = Arrangement.SpaceBetween,
+              verticalAlignment = Alignment.CenterVertically,
+            ) {
+              Column {
+                Text(
+                  text = stringResource(R.string.custom_series_builder_title),
+                  style = MaterialTheme.typography.titleMedium,
+                  fontWeight = FontWeight.Bold,
+                )
+                Text(
+                  text = stringResource(R.string.custom_series_episodes_count, episodes.size),
+                  style = MaterialTheme.typography.bodySmall,
+                  color = MaterialTheme.colorScheme.onSurfaceVariant,
+                )
+              }
+
+              if (episodes.size > 1) {
+                Text(
+                  text = stringResource(R.string.custom_series_drag_to_reorder),
+                  style = MaterialTheme.typography.labelSmall,
+                  color = MaterialTheme.colorScheme.primary,
+                )
+              }
+            }
+          }
+        }
+
+        // Reorderable Episode Items
+        itemsIndexed(
+          items = episodes,
+          key = { _, item -> item.filePath },
+        ) { index, item ->
+          ReorderableItem(
+            state = reorderableState,
+            key = item.filePath,
+          ) { isDragging ->
+            val elevation by animateDpAsState(if (isDragging) 8.dp else 0.dp, label = "elevation")
+            Card(
+              modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 16.dp, vertical = 4.dp)
+                .shadow(elevation, RoundedCornerShape(12.dp)),
+              shape = RoundedCornerShape(12.dp),
+              colors = CardDefaults.cardColors(
+                containerColor = if (isDragging) {
+                  MaterialTheme.colorScheme.surfaceContainerHighest
+                } else {
+                  MaterialTheme.colorScheme.surfaceContainer
+                },
+              ),
+            ) {
+              Row(
+                modifier = Modifier
+                  .fillMaxWidth()
+                  .padding(horizontal = 12.dp, vertical = 10.dp),
+                verticalAlignment = Alignment.CenterVertically,
+              ) {
+                // Drag handle
+                Icon(
+                  imageVector = Icons.Filled.DragHandle,
+                  contentDescription = stringResource(R.string.custom_series_drag_to_reorder),
+                  tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                  modifier = Modifier
+                    .draggableHandle()
+                    .padding(end = 10.dp),
+                )
+
+                // Episode info
+                Column(
+                  modifier = Modifier.weight(1f),
+                  verticalArrangement = Arrangement.spacedBy(4.dp),
+                ) {
+                  Text(
+                    text = item.fileName,
+                    style = MaterialTheme.typography.bodyMedium,
+                    fontWeight = FontWeight.Medium,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                  )
+
+                  // Season & Episode Chips (clickable to edit numbers explicitly)
+                  Row(
+                    horizontalArrangement = Arrangement.spacedBy(8.dp),
+                    verticalAlignment = Alignment.CenterVertically,
+                  ) {
+                    AssistChip(
+                      onClick = { editingEpisodeItem = index to item },
+                      label = {
+                        Text(
+                          text = "S${item.season.toString().padStart(2, '0')} · E${item.episode.toString().padStart(2, '0')}",
+                          style = MaterialTheme.typography.labelSmall,
+                          fontWeight = FontWeight.Bold,
+                        )
+                      },
+                      colors = AssistChipDefaults.assistChipColors(
+                        containerColor = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.6f),
+                        labelColor = MaterialTheme.colorScheme.onPrimaryContainer,
+                      ),
+                      border = null,
+                      shape = RoundedCornerShape(8.dp),
+                      modifier = Modifier.height(28.dp),
+                    )
+                  }
+                }
+
+                // Remove item button
+                IconButton(
+                  onClick = {
+                    episodes = episodes.filterIndexed { i, _ -> i != index }
+                      .mapIndexed { idx, draft -> draft.copy(position = idx) }
+                  },
+                ) {
+                  Icon(
+                    Icons.Filled.Close,
+                    contentDescription = "Remove",
+                    tint = MaterialTheme.colorScheme.onSurfaceVariant,
+                    modifier = Modifier.size(20.dp),
+                  )
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+
+    // Dialog: Edit Season & Episode explicitly
+    editingEpisodeItem?.let { (index, item) ->
+      SeasonEpisodeEditDialog(
+        currentSeason = item.season,
+        currentEpisode = item.episode,
+        fileName = item.fileName,
+        onDismiss = { editingEpisodeItem = null },
+        onConfirm = { newSeason, newEpisode ->
+          val updated = episodes.toMutableList()
+          updated[index] = item.copy(season = newSeason, episode = newEpisode)
+          episodes = updated
+          editingEpisodeItem = null
+        },
+      )
+    }
+
+    // Sheet: Add episodes from library videos
+    if (showAddEpisodesSheet) {
+      VideoPickerSheet(
+        alreadyAddedPaths = episodes.map { it.filePath }.toSet(),
+        onDismiss = { showAddEpisodesSheet = false },
+        onVideosSelected = { selectedVideos ->
+          val maxSeason = episodes.maxOfOrNull { it.season } ?: 1
+          var nextEp = (episodes.filter { it.season == maxSeason }.maxOfOrNull { it.episode } ?: 0) + 1
+          val startPos = episodes.size
+
+          val newDrafts = selectedVideos.mapIndexed { idx, video ->
+            val parsed = MediaInfoParser.parse(video.displayName)
+            val season = parsed.season ?: maxSeason
+            val ep = if (parsed.season != null && parsed.episode != null) {
+              parsed.episode
+            } else {
+              val epNum = nextEp
+              nextEp++
+              epNum
+            }
+            CustomSeriesItemDraft(
+              filePath = video.path,
+              fileName = video.displayName,
+              season = season,
+              episode = ep,
+              position = startPos + idx,
+            )
+          }
+
+          episodes = episodes + newDrafts
+          if (title.isBlank() && episodes.isNotEmpty()) {
+            val parsedFirst = MediaInfoParser.parse(episodes.first().fileName)
+            title = parsedFirst.title.ifBlank { "" }
+            if (year.isBlank()) year = parsedFirst.year.orEmpty()
+          }
+          showAddEpisodesSheet = false
+        },
+      )
+    }
+
+    // Discard changes dialog
+    if (showDiscardDialog) {
+      AlertDialog(
+        onDismissRequest = { showDiscardDialog = false },
+        containerColor = glassSheetContainerColor(MaterialTheme.colorScheme.surface),
+        title = { Text("Discard unsaved changes?") },
+        text = { Text("You have unsaved changes that will be lost if you leave.") },
+        confirmButton = {
+          TextButton(
+            onClick = {
+              showDiscardDialog = false
+              if (backstack.size > 1) {
+                backstack.removeLastOrNull()
+              } else {
+                (context as? android.app.Activity)?.finish()
+              }
+            },
+          ) {
+            Text("Discard", color = MaterialTheme.colorScheme.error)
+          }
+        },
+        dismissButton = {
+          TextButton(onClick = { showDiscardDialog = false }) {
+            Text(stringResource(R.string.generic_cancel))
+          }
+        },
+      )
+    }
+  }
+}
+
+@Composable
+private fun SeasonEpisodeEditDialog(
+  currentSeason: Int,
+  currentEpisode: Int,
+  fileName: String,
+  onDismiss: () -> Unit,
+  onConfirm: (season: Int, episode: Int) -> Unit,
+) {
+  var seasonText by remember { mutableStateOf(currentSeason.toString()) }
+  var episodeText by remember { mutableStateOf(currentEpisode.toString()) }
+
+  AlertDialog(
+    onDismissRequest = onDismiss,
+    containerColor = glassSheetContainerColor(MaterialTheme.colorScheme.surface),
+    title = {
+      Text(
+        text = stringResource(R.string.custom_series_season_episode_dialog_title),
+        style = MaterialTheme.typography.titleLarge,
+        fontWeight = FontWeight.Bold,
+      )
+    },
+    text = {
+      Column(
+        modifier = Modifier.fillMaxWidth(),
+        verticalArrangement = Arrangement.spacedBy(12.dp),
+      ) {
+        Text(
+          text = fileName,
+          style = MaterialTheme.typography.bodySmall,
+          color = MaterialTheme.colorScheme.onSurfaceVariant,
+          maxLines = 2,
+          overflow = TextOverflow.Ellipsis,
+        )
+
+        Row(
+          modifier = Modifier.fillMaxWidth(),
+          horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+          OutlinedTextField(
+            value = seasonText,
+            onValueChange = { input -> seasonText = input.filter { it.isDigit() } },
+            label = { Text(stringResource(R.string.custom_series_season_label)) },
+            singleLine = true,
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            modifier = Modifier.weight(1f),
+            shape = RoundedCornerShape(12.dp),
+          )
+
+          OutlinedTextField(
+            value = episodeText,
+            onValueChange = { input -> episodeText = input.filter { it.isDigit() } },
+            label = { Text(stringResource(R.string.custom_series_episode_label)) },
+            singleLine = true,
+            keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number),
+            modifier = Modifier.weight(1f),
+            shape = RoundedCornerShape(12.dp),
+          )
+        }
+      }
+    },
+    confirmButton = {
+      Button(
+        onClick = {
+          val s = seasonText.toIntOrNull()?.coerceAtLeast(0) ?: currentSeason
+          val e = episodeText.toIntOrNull()?.coerceAtLeast(1) ?: currentEpisode
+          onConfirm(s, e)
+        },
+      ) {
+        Text(stringResource(R.string.generic_confirm))
+      }
+    },
+    dismissButton = {
+      TextButton(onClick = onDismiss) {
+        Text(stringResource(R.string.generic_cancel))
+      }
+    },
+  )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+private fun VideoPickerSheet(
+  alreadyAddedPaths: Set<String>,
+  onDismiss: () -> Unit,
+  onVideosSelected: (List<Video>) -> Unit,
+) {
+  val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+  val libraryIndexRepository = koinInject<LibraryIndexRepository>()
+
+  var allVideos by remember { mutableStateOf<List<Video>>(emptyList()) }
+  var searchQuery by remember { mutableStateOf("") }
+  val selectedPaths = remember { mutableStateOf(setOf<String>()) }
+  var isLoading by remember { mutableStateOf(true) }
+
+  LaunchedEffect(Unit) {
+    withContext(Dispatchers.IO) {
+      val library = libraryIndexRepository.getLibrary()
+      val list = library.folders.flatMap { it.videos }
+      val unique = list.distinctBy { it.path }.sortedBy { it.displayName.lowercase() }
+      allVideos = unique
+      isLoading = false
+    }
+  }
+
+  val filteredVideos = remember(allVideos, searchQuery, alreadyAddedPaths) {
+    val unadded = allVideos.filter { it.path !in alreadyAddedPaths }
+    if (searchQuery.isBlank()) {
+      unadded
+    } else {
+      unadded.filter { it.displayName.contains(searchQuery, ignoreCase = true) }
+    }
+  }
+
+  ModalBottomSheet(
+    onDismissRequest = onDismiss,
+    sheetState = sheetState,
+    containerColor = glassSheetContainerColor(MaterialTheme.colorScheme.surface),
+  ) {
+    Column(
+      modifier = Modifier
+        .fillMaxWidth()
+        .padding(horizontal = 16.dp)
+        .navigationBarsPadding(),
+    ) {
+      Row(
+        modifier = Modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+      ) {
+        Text(
+          text = stringResource(R.string.custom_series_add_episodes),
+          style = MaterialTheme.typography.titleLarge,
+          fontWeight = FontWeight.Bold,
+        )
+
+        Button(
+          onClick = {
+            val selected = allVideos.filter { it.path in selectedPaths.value }
+            onVideosSelected(selected)
+          },
+          enabled = selectedPaths.value.isNotEmpty(),
+          shape = RoundedCornerShape(16.dp),
+        ) {
+          Text("Add (${selectedPaths.value.size})")
+        }
+      }
+
+      Spacer(modifier = Modifier.height(12.dp))
+
+      OutlinedTextField(
+        value = searchQuery,
+        onValueChange = { searchQuery = it },
+        placeholder = { Text(stringResource(R.string.search)) },
+        leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) },
+        singleLine = true,
+        modifier = Modifier.fillMaxWidth(),
+        shape = RoundedCornerShape(12.dp),
+      )
+
+      Spacer(modifier = Modifier.height(12.dp))
+
+      if (isLoading) {
+        Box(
+          modifier = Modifier
+            .fillMaxWidth()
+            .height(200.dp),
+          contentAlignment = Alignment.Center,
+        ) {
+          CircularProgressIndicator()
+        }
+      } else if (filteredVideos.isEmpty()) {
+        Box(
+          modifier = Modifier
+            .fillMaxWidth()
+            .height(160.dp),
+          contentAlignment = Alignment.Center,
+        ) {
+          Text(
+            text = "No videos available to add",
+            style = MaterialTheme.typography.bodyMedium,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+          )
+        }
+      } else {
+        LazyColumn(
+          modifier = Modifier
+            .fillMaxWidth()
+            .height(380.dp),
+          verticalArrangement = Arrangement.spacedBy(4.dp),
+        ) {
+          itemsIndexed(filteredVideos, key = { _, v -> v.path }) { _, video ->
+            val isChecked = video.path in selectedPaths.value
+            Row(
+              modifier = Modifier
+                .fillMaxWidth()
+                .clip(RoundedCornerShape(8.dp))
+                .clickable {
+                  val current = selectedPaths.value
+                  selectedPaths.value = if (isChecked) current - video.path else current + video.path
+                }
+                .padding(horizontal = 8.dp, vertical = 6.dp),
+              verticalAlignment = Alignment.CenterVertically,
+            ) {
+              Checkbox(
+                checked = isChecked,
+                onCheckedChange = { checked ->
+                  val current = selectedPaths.value
+                  selectedPaths.value = if (checked) current + video.path else current - video.path
+                },
+              )
+              Spacer(modifier = Modifier.width(8.dp))
+              Column(modifier = Modifier.weight(1f)) {
+                Text(
+                  text = video.displayName,
+                  style = MaterialTheme.typography.bodyMedium,
+                  maxLines = 1,
+                  overflow = TextOverflow.Ellipsis,
+                )
+                Text(
+                  text = File(video.path).parentFile?.name ?: "",
+                  style = MaterialTheme.typography.bodySmall,
+                  color = MaterialTheme.colorScheme.onSurfaceVariant,
+                  maxLines = 1,
+                  overflow = TextOverflow.Ellipsis,
+                )
+              }
+            }
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesDetailScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesDetailScreen.kt
index b961193c..1a8fe53f 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesDetailScreen.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesDetailScreen.kt
@@ -125,15 +125,22 @@ data class SeriesDetailScreen(
     val paneBack = LocalDetailPaneBack.current
     val libraryIndexRepository = koinInject<LibraryIndexRepository>()
     val metadataRepository = koinInject<StreamingMetadataRepository>()
+    val customSeriesRepository = koinInject<app.aryan447.mpvium.database.repository.CustomSeriesRepository>()
     val artworkStore = koinInject<StreamingArtworkStore>()
     val introSkipRepository = koinInject<IntroSkipRepository>()
     val coroutineScope = rememberCoroutineScope()
 
+    val isCustomSeries = remember(seriesId) { seriesId.startsWith("custom:") }
+    val customSeriesId = remember(seriesId, isCustomSeries) {
+      if (isCustomSeries) seriesId.removePrefix("custom:").toIntOrNull() else null
+    }
+
     var series by remember { mutableStateOf<LocalSeries?>(null) }
     var isLoading by remember { mutableStateOf(true) }
     var selectedSeason by remember { mutableIntStateOf(1) }
     var reloadKey by remember { mutableIntStateOf(0) }
     var pendingDeletion by remember { mutableStateOf<Pair<String, List<Video>>?>(null) }
+    var showDeleteCustomSeriesDialog by remember { mutableStateOf(false) }
     var showMatchPicker by remember { mutableStateOf(false) }
     var showEditMetadataSheet by remember { mutableStateOf(false) }
     var matchOptions by remember { mutableStateOf<List<WyzieTmdbResult>>(emptyList()) }
@@ -167,7 +174,11 @@ data class SeriesDetailScreen(
           isLoading = false
 
           // Enrich in background; manual reload (reloadKey > 0) forces a re-fetch
-          val enriched = metadataRepository.enrichSeries(found, forceRefresh = reloadKey > 0)
+          val enriched = if (isCustomSeries) {
+            metadataRepository.applyCachedSeries(found)
+          } else {
+            metadataRepository.enrichSeries(found, forceRefresh = reloadKey > 0)
+          }
           series = enriched
         } else {
           isLoading = false
@@ -185,7 +196,11 @@ data class SeriesDetailScreen(
       coroutineScope.launch(Dispatchers.IO) {
         val detected = libraryIndexRepository.getLibrary()
         val found = detected.series.find { it.id == seriesId } ?: return@launch
-        val enriched = metadataRepository.enrichSeries(found, forceRefresh = false)
+        val enriched = if (isCustomSeries) {
+          metadataRepository.applyCachedSeries(found)
+        } else {
+          metadataRepository.enrichSeries(found, forceRefresh = false)
+        }
         withContext(Dispatchers.Main) {
           series = enriched
           selectedSeason =
@@ -341,27 +356,35 @@ data class SeriesDetailScreen(
                   .padding(top = 40.dp, end = 12.dp),
                 horizontalArrangement = Arrangement.spacedBy(8.dp),
               ) {
+                if (!isCustomSeries) {
+                  IconButton(
+                    onClick = {
+                      showMatchPicker = true
+                    },
+                    modifier = Modifier
+                      .size(40.dp)
+                      .clip(CircleShape)
+                      .background(Color.Black.copy(alpha = 0.5f)),
+                  ) {
+                    Icon(Icons.Filled.Refresh, contentDescription = "Fix match from search", tint = Color.White)
+                  }
+                }
                 IconButton(
                   onClick = {
-                    showMatchPicker = true
+                    if (isCustomSeries && customSeriesId != null) {
+                      backstack.add(CustomSeriesBuilderScreen(seriesId = customSeriesId))
+                    } else {
+                      showEditMetadataSheet = true
+                    }
                   },
                   modifier = Modifier
                     .size(40.dp)
                     .clip(CircleShape)
                     .background(Color.Black.copy(alpha = 0.5f)),
-                ) {
-                  Icon(Icons.Filled.Refresh, contentDescription = "Fix match from search", tint = Color.White)
-                }
-                IconButton(
-                  onClick = { showEditMetadataSheet = true },
-                  modifier = Modifier
-                    .size(40.dp)
-                    .clip(CircleShape)
-                    .background(Color.Black.copy(alpha = 0.5f)),
                 ) {
                   Icon(
                     Icons.Filled.Edit,
-                    contentDescription = stringResource(R.string.metadata_edit_title),
+                    contentDescription = stringResource(if (isCustomSeries) R.string.edit_series else R.string.metadata_edit_title),
                     tint = Color.White,
                   )
                 }
@@ -376,14 +399,22 @@ data class SeriesDetailScreen(
                 }
                 IconButton(
                   onClick = {
-                    pendingDeletion = currentSeries.title to currentSeries.seasons.values.flatten().map { it.video }
+                    if (isCustomSeries) {
+                      showDeleteCustomSeriesDialog = true
+                    } else {
+                      pendingDeletion = currentSeries.title to currentSeries.seasons.values.flatten().map { it.video }
+                    }
                   },
                   modifier = Modifier
                     .size(40.dp)
                     .clip(CircleShape)
                     .background(Color.Black.copy(alpha = 0.5f)),
                 ) {
-                  Icon(Icons.Filled.Delete, contentDescription = "Delete TV show", tint = Color.White)
+                  Icon(
+                    Icons.Filled.Delete,
+                    contentDescription = if (isCustomSeries) stringResource(R.string.delete_series_action) else "Delete TV show",
+                    tint = Color.White,
+                  )
                 }
               }
             }
@@ -644,6 +675,61 @@ data class SeriesDetailScreen(
       )
     }
 
+    if (showDeleteCustomSeriesDialog && customSeriesId != null) {
+      val seriesTitle = series?.title.orEmpty()
+      AlertDialog(
+        onDismissRequest = { showDeleteCustomSeriesDialog = false },
+        containerColor = glassSheetContainerColor(MaterialTheme.colorScheme.surface),
+        title = {
+          Text(
+            text = stringResource(R.string.delete_custom_series_title),
+            style = MaterialTheme.typography.headlineMedium,
+            fontWeight = FontWeight.Bold,
+          )
+        },
+        text = {
+          Text(
+            text = stringResource(R.string.delete_custom_series_message, seriesTitle),
+            style = MaterialTheme.typography.bodyMedium,
+          )
+        },
+        confirmButton = {
+          Button(
+            onClick = {
+              showDeleteCustomSeriesDialog = false
+              coroutineScope.launch {
+                withContext(Dispatchers.IO) {
+                  customSeriesRepository.deleteSeries(customSeriesId)
+                  MediaLibraryEvents.notifyChanged()
+                }
+                withContext(Dispatchers.Main) {
+                  if (paneBack != null) {
+                    paneBack()
+                  } else if (backstack.size > 1) {
+                    backstack.removeLastOrNull()
+                  } else {
+                    (context as? android.app.Activity)?.finish()
+                  }
+                }
+              }
+            },
+            colors = ButtonDefaults.buttonColors(
+              containerColor = MaterialTheme.colorScheme.error,
+              contentColor = MaterialTheme.colorScheme.onError,
+            ),
+          ) {
+            Text(stringResource(R.string.delete_series_action))
+          }
+        },
+        dismissButton = {
+          TextButton(onClick = { showDeleteCustomSeriesDialog = false }) {
+            Text(stringResource(R.string.generic_cancel))
+          }
+        },
+        shape = MaterialTheme.shapes.extraLarge,
+      )
+    }
+
     if (showMatchPicker) {
       AlertDialog(
         onDismissRequest = { showMatchPicker = false },
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt
index f4a417b5..7b6dd8c9 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt
@@ -26,6 +26,7 @@ import androidx.compose.foundation.lazy.grid.rememberLazyGridState
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Add
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material.icons.filled.Search
 import androidx.compose.material.icons.filled.Tv
@@ -306,6 +307,12 @@ object SeriesGridScreen : Screen {
               IconButton(onClick = { isSearching = true }) {
                 Icon(Icons.Filled.Search, contentDescription = "Search")
               }
+              IconButton(onClick = { backstack.add(CustomSeriesBuilderScreen()) }) {
+                Icon(
+                  Icons.Filled.Add,
+                  contentDescription = stringResource(R.string.create_series),
+                )
+              }
               MediaLayoutToggle(
                 mode = layoutShows,
                 onToggle = {
@@ -448,7 +455,7 @@ private fun SeriesGridContent(
         searchQuery.isNotBlank() -> "No TV shows match '$searchQuery'"
         filteringByWatchState -> "Try a different watch-state filter"
         libraryFiltered -> stringResource(R.string.library_sources_banner_message)
-        else -> "Add TV shows with S01E01 or season folders to see them here"
+        else -> stringResource(R.string.custom_series_empty_shows_help)
       },
       modifier = Modifier
         .fillMaxSize()
@@ -457,13 +464,13 @@ private fun SeriesGridContent(
         searchQuery.isNotBlank() -> "Clear search"
         filteringByWatchState -> "Show all"
         libraryFiltered -> stringResource(R.string.library_sources_empty_action)
-        else -> null
+        else -> stringResource(R.string.create_series)
       },
       onAction = when {
         searchQuery.isNotBlank() -> onClearSearch
         filteringByWatchState -> ({ onSeriesFilterChange(SeriesWatchFilter.ALL) })
         libraryFiltered -> onManageLibrarySources
-        else -> null
+        else -> ({ backstack.add(CustomSeriesBuilderScreen()) })
       },
     )
   } else {
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f7600ad2..1008ab02 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -725,4 +725,25 @@
   <string name="titles_pane_select_title">Select a title</string>
   <string name="titles_pane_select_message">Pick a show or movie to see details, actions and matches here</string>
   <string name="title_watch_filter_content_description">Watch filter: %1$s</string>
+  <!-- Custom series -->
+  <string name="add_to_series">Add to series…</string>
+  <string name="create_series">Create series</string>
+  <string name="edit_series">Edit series</string>
+  <string name="new_series">New series</string>
+  <string name="delete_custom_series_title">Delete custom series?</string>
+  <string name="delete_custom_series_message">This will delete the custom series \"%1$s\" grouping. Your video files will NOT be deleted.</string>
+  <string name="delete_series_action">Delete series</string>
+  <string name="custom_series_builder_title">Episodes</string>
+  <string name="custom_series_episodes_count">%1$d episodes</string>
+  <string name="custom_series_add_episodes">Add episodes</string>
+  <string name="custom_series_drag_to_reorder">Drag to reorder</string>
+  <string name="custom_series_empty_shows_help">Add TV shows with S01E01 or season folders to see them here, or build your own custom show out of any videos.</string>
+  <string name="custom_series_pick_poster">Add cover</string>
+  <string name="custom_series_season_episode_dialog_title">Edit season &amp; episode</string>
+  <string name="custom_series_season_label">Season</string>
+  <string name="custom_series_episode_label">Episode</string>
+  <string name="custom_series_saved">Series saved</string>
+  <string name="custom_series_choose_series">Add to series</string>
+  <string name="custom_series_create_new">Create new series</string>
+  <string name="custom_series_added_to">Added to \"%1$s\"</string>
 </resources>
diff --git a/app/src/test/java/app/aryan447/mpvium/domain/streaming/CustomSeriesTest.kt b/app/src/test/java/app/aryan447/mpvium/domain/streaming/CustomSeriesTest.kt
new file mode 100644
index 00000000..eaf2d259
--- /dev/null
+++ b/app/src/test/java/app/aryan447/mpvium/domain/streaming/CustomSeriesTest.kt
@@ -0,0 +1,170 @@
+package app.aryan447.mpvium.domain.streaming
+
+import app.aryan447.mpvium.database.entities.CustomSeriesEntity
+import app.aryan447.mpvium.database.entities.CustomSeriesItemEntity
+import app.aryan447.mpvium.database.repository.CustomSeriesItemDraft
+import app.aryan447.mpvium.domain.media.model.Video
+import app.aryan447.mpvium.domain.streaming.model.LocalEpisode
+import app.aryan447.mpvium.domain.streaming.model.LocalSeries
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertFalse
+import org.junit.Assert.assertNotNull
+import org.junit.Assert.assertTrue
+import org.junit.Test
+import org.junit.runner.RunWith
+import org.junit.runners.JUnit4
+
+@RunWith(JUnit4::class)
+class CustomSeriesTest {
+
+  @Test
+  fun customSeries_deterministicIdFormat() {
+    val seriesId = 42
+    val deterministicId = "custom:$seriesId"
+    assertTrue(deterministicId.startsWith("custom:"))
+    assertEquals(seriesId, deterministicId.removePrefix("custom:").toIntOrNull())
+  }
+
+  @Test
+  fun customSeriesEntity_propertiesAndDefaults() {
+    val now = 1700000000000L
+    val entity = CustomSeriesEntity(
+      id = 1,
+      title = "My Curated Show",
+      year = "2024",
+      posterPath = "/data/user/0/app.aryan447.mpvium/files/streaming_art/custom_art.img",
+      tmdbId = 12345,
+      createdAt = now,
+      updatedAt = now,
+    )
+
+    assertEquals(1, entity.id)
+    assertEquals("My Curated Show", entity.title)
+    assertEquals("2024", entity.year)
+    assertEquals("/data/user/0/app.aryan447.mpvium/files/streaming_art/custom_art.img", entity.posterPath)
+    assertEquals(12345, entity.tmdbId)
+    assertEquals(now, entity.createdAt)
+    assertEquals(now, entity.updatedAt)
+  }
+
+  @Test
+  fun customSeriesItemEntity_properties() {
+    val item = CustomSeriesItemEntity(
+      id = 10,
+      seriesId = 1,
+      filePath = "/storage/emulated/0/Videos/EP01.mkv",
+      fileName = "EP01.mkv",
+      season = 1,
+      episode = 1,
+      position = 0,
+    )
+
+    assertEquals(10, item.id)
+    assertEquals(1, item.seriesId)
+    assertEquals("/storage/emulated/0/Videos/EP01.mkv", item.filePath)
+    assertEquals("EP01.mkv", item.fileName)
+    assertEquals(1, item.season)
+    assertEquals(1, item.episode)
+    assertEquals(0, item.position)
+  }
+
+  @Test
+  fun claimedFilesExclusion_preventsVideosFromBeingGroupedTwice() {
+    val claimedPath = "/storage/emulated/0/Videos/ShowA.mkv"
+    val unclaimedPath = "/storage/emulated/0/Videos/ShowB.mkv"
+
+    val customItems = listOf(
+      CustomSeriesItemEntity(
+        id = 1,
+        seriesId = 99,
+        filePath = claimedPath,
+        fileName = "ShowA.mkv",
+        season = 1,
+        episode = 1,
+        position = 0,
+      )
+    )
+
+    val allVideos = listOf(
+      Video(id = 1L, title = "ShowA", path = claimedPath, duration = 3000L, size = 100L, dateAdded = 0L, dateModified = 0L, displayName = "ShowA.mkv"),
+      Video(id = 2L, title = "ShowB", path = unclaimedPath, duration = 4000L, size = 200L, dateAdded = 0L, dateModified = 0L, displayName = "ShowB.mkv"),
+    )
+
+    val claimedPaths = customItems.mapTo(HashSet()) { it.filePath }
+    val scannerCandidates = allVideos.filter { it.path !in claimedPaths }
+
+    assertEquals(1, scannerCandidates.size)
+    assertEquals(unclaimedPath, scannerCandidates.first().path)
+    assertFalse(scannerCandidates.any { it.path == claimedPath })
+  }
+
+  @Test
+  fun customSeriesMapping_constructsSeasonsAndEpisodesCorrectly() {
+    val video1 = Video(id = 101L, title = "V1", path = "/path/1.mkv", duration = 120_000L, size = 100L, dateAdded = 0L, dateModified = 0L, displayName = "1.mkv")
+    val video2 = Video(id = 102L, title = "V2", path = "/path/2.mkv", duration = 180_000L, size = 100L, dateAdded = 0L, dateModified = 0L, displayName = "2.mkv")
+    val video3 = Video(id = 103L, title = "V3", path = "/path/3.mkv", duration = 200_000L, size = 100L, dateAdded = 0L, dateModified = 0L, displayName = "3.mkv")
+
+    val episodes = listOf(
+      LocalEpisode(video = video1, seasonNumber = 1, episodeNumber = 1, isWatched = true, playbackPositionMs = 120_000L),
+      LocalEpisode(video = video2, seasonNumber = 1, episodeNumber = 2, isWatched = false, playbackPositionMs = 50_000L),
+      LocalEpisode(video = video3, seasonNumber = 2, episodeNumber = 1, isWatched = false, playbackPositionMs = 0L),
+    )
+
+    val seasonsMap = episodes
+      .groupBy { it.seasonNumber }
+      .mapValues { (_, eps) -> eps.sortedWith(compareBy({ it.seasonNumber }, { it.episodeNumber })) }
+      .toSortedMap()
+
+    assertEquals(2, seasonsMap.size)
+    assertEquals(2, seasonsMap[1]?.size)
+    assertEquals(1, seasonsMap[2]?.size)
+
+    val allEpisodes = seasonsMap.values.flatten()
+    val totalEpisodes = allEpisodes.size
+    val totalDuration = allEpisodes.sumOf { it.video.duration }
+    val watchedCount = allEpisodes.count { it.isWatched }
+
+    assertEquals(3, totalEpisodes)
+    assertEquals(500_000L, totalDuration)
+    assertEquals(1, watchedCount)
+
+    val customSeries = LocalSeries(
+      id = "custom:10",
+      title = "Custom Anime Selection",
+      year = "2024",
+      posterUrl = "/path/to/poster.img",
+      totalEpisodes = totalEpisodes,
+      totalDurationMs = totalDuration,
+      watchedEpisodesCount = watchedCount,
+      seasons = seasonsMap,
+    )
+
+    assertEquals("custom:10", customSeries.id)
+    assertEquals("Custom Anime Selection", customSeries.title)
+    assertEquals("2024", customSeries.year)
+    assertEquals(2, customSeries.seasonCount)
+    assertFalse(customSeries.isCompleted)
+    assertEquals(1f / 3f, customSeries.progressPercentage, 0.001f)
+  }
+
+  @Test
+  fun dragReorder_updatesPositionsCorrectly() {
+    val items = mutableListOf(
+      CustomSeriesItemDraft(filePath = "/a.mkv", fileName = "a.mkv", season = 1, episode = 1, position = 0),
+      CustomSeriesItemDraft(filePath = "/b.mkv", fileName = "b.mkv", season = 1, episode = 2, position = 1),
+      CustomSeriesItemDraft(filePath = "/c.mkv", fileName = "c.mkv", season = 1, episode = 3, position = 2),
+    )
+
+    // Move index 2 ("/c.mkv") to index 0
+    val moved = items.removeAt(2)
+    items.add(0, moved)
+    val reindexed = items.mapIndexed { index, draft -> draft.copy(position = index) }
+
+    assertEquals("/c.mkv", reindexed[0].filePath)
+    assertEquals(0, reindexed[0].position)
+    assertEquals("/a.mkv", reindexed[1].filePath)
+    assertEquals(1, reindexed[1].position)
+    assertEquals("/b.mkv", reindexed[2].filePath)
+    assertEquals(2, reindexed[2].position)
+  }
+}

From 541d85ec1cca28a4feb0e0b1483facc4f3255612 Mon Sep 17 00:00:00 2001
From: aryan447 <singharyan4477@gmail.com>
Date: Sat, 7 Nov 2026 18:35:43 +0530
Subject: [PATCH 2/3] fix(series): resolve compilation errors in custom series
 implementation

Fix 4 distinct Kotlin compiler errors in CI:
- Video data class: add default argument values so callers constructing Video instances without media-store attributes compile cleanly
- SeriesDetector: pass fallback uri and displayName when synthesizing fallback Video instances
- CustomSeriesBuilderScreen: replace obsolete cafe.adriel.voyager Screen import with app.aryan447.mpvium.presentation.Screen, resolving Screen type mismatches in callers
- VideoPickerSheet: resolve videos from MediaFileRepository bucket query and library items instead of nonexistent VideoFolder.videos
- SeriesGridScreen: pass onCreateSeries callback to SeriesGridContent to fix unresolved backstack reference in empty-state action

Method: unmeasured; fixes compilation errors from PR #166
---
 .../mpvium/domain/media/model/Video.kt        | 30 +++++++++----------
 .../mpvium/domain/streaming/SeriesDetector.kt |  4 ++-
 .../series/CustomSeriesBuilderScreen.kt       | 10 +++++--
 .../ui/streaming/series/SeriesGridScreen.kt   |  5 +++-
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/app/src/main/java/app/aryan447/mpvium/domain/media/model/Video.kt b/app/src/main/java/app/aryan447/mpvium/domain/media/model/Video.kt
index 34904d07..9941e175 100644
--- a/app/src/main/java/app/aryan447/mpvium/domain/media/model/Video.kt
+++ b/app/src/main/java/app/aryan447/mpvium/domain/media/model/Video.kt
@@ -7,22 +7,22 @@ import androidx.compose.runtime.Immutable
 data class Video(
   val id: Long,
   val title: String,
-  val displayName: String,
+  val displayName: String = title,
   val path: String,
-  val uri: Uri,
-  val duration: Long,
-  val durationFormatted: String,
-  val size: Long,
-  val sizeFormatted: String,
-  val dateModified: Long,
-  val dateAdded: Long,
-  val mimeType: String,
-  val bucketId: String,
-  val bucketDisplayName: String,
-  val width: Int,
-  val height: Int,
-  val fps: Float,
-  val resolution: String,
+  val uri: Uri = Uri.EMPTY,
+  val duration: Long = 0L,
+  val durationFormatted: String = "",
+  val size: Long = 0L,
+  val sizeFormatted: String = "",
+  val dateModified: Long = 0L,
+  val dateAdded: Long = 0L,
+  val mimeType: String = "",
+  val bucketId: String = "",
+  val bucketDisplayName: String = "",
+  val width: Int = 0,
+  val height: Int = 0,
+  val fps: Float = 0f,
+  val resolution: String = "",
   val hasEmbeddedSubtitles: Boolean = false,
   val subtitleCodec:  String = "",
 )
diff --git a/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt b/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
index 1b3a0144..03f09318 100644
--- a/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
+++ b/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
@@ -1,6 +1,7 @@
 package app.aryan447.mpvium.domain.streaming
 
 import android.content.Context
+import android.net.Uri
 import android.util.Log
 import app.aryan447.mpvium.database.MpviumDatabase
 import app.aryan447.mpvium.database.entities.PlaybackStateEntity
@@ -484,12 +485,13 @@ class SeriesDetector(
             ?: Video(
               id = (customSeries.id * 100_000L + idx),
               title = item.fileName,
+              displayName = item.fileName,
               path = item.filePath,
+              uri = runCatching { Uri.fromFile(File(item.filePath)) }.getOrDefault(Uri.EMPTY),
               duration = 0L,
               size = 0L,
               dateAdded = customSeries.createdAt,
               dateModified = customSeries.createdAt,
-              displayName = item.fileName,
             )
 
           val playbackState = playbackStates[video.displayName] ?: playbackStates[video.title]
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt
index 056a9ea9..03bd4ff8 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/CustomSeriesBuilderScreen.kt
@@ -99,9 +99,10 @@ import app.aryan447.mpvium.domain.streaming.LibraryIndexRepository
 import app.aryan447.mpvium.domain.streaming.StreamingArtworkStore
 import app.aryan447.mpvium.ui.theme.glassSheetContainerColor
 import app.aryan447.mpvium.ui.utils.LocalBackStack
+import app.aryan447.mpvium.presentation.Screen
+import app.aryan447.mpvium.repository.MediaFileRepository
 import app.aryan447.mpvium.utils.media.MediaInfoParser
 import app.aryan447.mpvium.utils.media.MediaLibraryEvents
-import cafe.adriel.voyager.core.screen.Screen
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -775,6 +776,7 @@ private fun VideoPickerSheet(
   onVideosSelected: (List<Video>) -> Unit,
 ) {
   val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+  val context = LocalContext.current
   val libraryIndexRepository = koinInject<LibraryIndexRepository>()
 
   var allVideos by remember { mutableStateOf<List<Video>>(emptyList()) }
@@ -785,8 +787,10 @@ private fun VideoPickerSheet(
   LaunchedEffect(Unit) {
     withContext(Dispatchers.IO) {
       val library = libraryIndexRepository.getLibrary()
-      val list = library.folders.flatMap { it.videos }
-      val unique = list.distinctBy { it.path }.sortedBy { it.displayName.lowercase() }
+      val bucketIds = library.folders.map { it.bucketId }.toSet()
+      val listFromBuckets = MediaFileRepository.getVideosForBuckets(context, bucketIds)
+      val listFromLibrary = library.series.flatMap { it.seasons.values.flatten().map { ep -> ep.video } } + library.movies.map { it.video }
+      val unique = (listFromBuckets + listFromLibrary).distinctBy { it.path }.sortedBy { it.displayName.lowercase() }
       allVideos = unique
       isLoading = false
     }
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt
index 7b6dd8c9..cd7be26e 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/streaming/series/SeriesGridScreen.kt
@@ -363,6 +363,7 @@ object SeriesGridScreen : Screen {
               libraryFiltered = libraryFiltered,
               onManageLibrarySources = { backstack.add(FoldersPreferencesScreen) },
               onSeriesClick = { selectedSeriesId = it.id },
+              onCreateSeries = { backstack.add(CustomSeriesBuilderScreen()) },
             )
           }
           VerticalDivider(modifier = Modifier.fillMaxHeight())
@@ -402,6 +403,7 @@ object SeriesGridScreen : Screen {
           libraryFiltered = libraryFiltered,
           onManageLibrarySources = { backstack.add(FoldersPreferencesScreen) },
           onSeriesClick = { backstack.add(SeriesDetailScreen(it.id)) },
+          onCreateSeries = { backstack.add(CustomSeriesBuilderScreen()) },
         )
       }
     }
@@ -432,6 +434,7 @@ private fun SeriesGridContent(
   libraryFiltered: Boolean,
   onManageLibrarySources: () -> Unit,
   onSeriesClick: (LocalSeries) -> Unit,
+  onCreateSeries: () -> Unit,
 ) {
   if (isLoading) {
     Box(
@@ -470,7 +473,7 @@ private fun SeriesGridContent(
         searchQuery.isNotBlank() -> onClearSearch
         filteringByWatchState -> ({ onSeriesFilterChange(SeriesWatchFilter.ALL) })
         libraryFiltered -> onManageLibrarySources
-        else -> ({ backstack.add(CustomSeriesBuilderScreen()) })
+        else -> onCreateSeries
       },
     )
   } else {

From 1eb85de388b873aa1148265f868ca621622f783c Mon Sep 17 00:00:00 2001
From: aryan447 <singharyan4477@gmail.com>
Date: Sat, 7 Nov 2026 18:40:11 +0530
Subject: [PATCH 3/3] fix(series): address review feedback on ordering and
 remaining time

- Honor saved episode position by preserving custom episode order within seasons
- Avoid ambiguous basename resolution by filtering only unique display names
- Compute inverted duration in CompactTimecode from position - duration

Method: unmeasured; fixes review feedback from Codex
---
 .../aryan447/mpvium/domain/streaming/SeriesDetector.kt    | 8 ++++----
 .../mpvium/ui/player/controls/components/Seekbar.kt       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt b/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
index 03f09318..d3e10359 100644
--- a/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
+++ b/app/src/main/java/app/aryan447/mpvium/domain/streaming/SeriesDetector.kt
@@ -471,7 +471,10 @@ class SeriesDetector(
 
       // Build custom series overlays (deterministic id: "custom:<id>")
       val videoByPath = items.associate { it.first.path to it.first }
-      val videoByName = items.associate { it.first.displayName to it.first }
+      val videoByName = items
+        .groupBy { it.first.displayName }
+        .filterValues { it.size == 1 }
+        .mapValues { it.value.first().first }
 
       val customSeriesBuiltList = customSeriesList.mapNotNull { customSeries ->
         val seriesItems = customSeriesItems
@@ -516,9 +519,6 @@ class SeriesDetector(
 
         val seasonsMap = customEpisodes
           .groupBy { it.seasonNumber }
-          .mapValues { (_, eps) ->
-            eps.sortedWith(compareBy({ it.seasonNumber }, { it.episodeNumber }, { it.video.displayName }))
-          }
           .toSortedMap()
 
         val allEpisodes = seasonsMap.values.flatten()
diff --git a/app/src/main/java/app/aryan447/mpvium/ui/player/controls/components/Seekbar.kt b/app/src/main/java/app/aryan447/mpvium/ui/player/controls/components/Seekbar.kt
index f988afc3..760c4c94 100644
--- a/app/src/main/java/app/aryan447/mpvium/ui/player/controls/components/Seekbar.kt
+++ b/app/src/main/java/app/aryan447/mpvium/ui/player/controls/components/Seekbar.kt
@@ -1070,7 +1070,8 @@ fun CompactTimecode(
   val clickEvent = LocalPlayerButtonsClickEvent.current
   val interactionSource = remember { MutableInteractionSource() }
   val currentText = Utils.prettyTime(position.toInt(), false)
-  val totalText = Utils.prettyTime(duration.toInt(), isInverted)
+  val totalValue = if (isInverted) position - duration else duration
+  val totalText = Utils.prettyTime(totalValue.toInt(), isInverted)
   val colors = LocalPlayerColors.current
   Text(
     modifier = modifier