From 05e23a155367322a3bc00e855e696dcaa75ad9c2 Mon Sep 17 00:00:00 2001 From: Francesco <100066266+cranci1@users.noreply.github.com> Date: Fri, 25 Apr 2025 21:04:48 +0200 Subject: [PATCH] Revert "test episode order" This reverts commit 1637383a19680bc803913ffac2ee9e9ca7cf626c. --- Sora/Views/MediaInfoView/MediaInfoView.swift | 12 ++---------- .../SettingsSubViews/SettingsViewGeneral.swift | 16 ---------------- 2 files changed, 2 insertions(+), 26 deletions(-) diff --git a/Sora/Views/MediaInfoView/MediaInfoView.swift b/Sora/Views/MediaInfoView/MediaInfoView.swift index a967891..902228e 100644 --- a/Sora/Views/MediaInfoView/MediaInfoView.swift +++ b/Sora/Views/MediaInfoView/MediaInfoView.swift @@ -44,7 +44,6 @@ struct MediaInfoView: View { @AppStorage("externalPlayer") private var externalPlayer: String = "Default" @AppStorage("episodeChunkSize") private var episodeChunkSize: Int = 100 - @AppStorage("episodeSortOrder") private var episodeSortOrder: String = "Ascending" @StateObject private var jsController = JSController() @EnvironmentObject var moduleManager: ModuleManager @@ -596,13 +595,6 @@ struct MediaInfoView: View { return groups } - private func sortEpisodes(_ episodes: [EpisodeLink]) -> [EpisodeLink] { - if episodeSortOrder == "Descending" { - return episodes.sorted(by: { $0.number > $1.number }) - } else { - return episodes.sorted(by: { $0.number < $1.number }) - } - } func fetchDetails() { DispatchQueue.main.asyncAfter(deadline: .now() + 0.5) { @@ -617,7 +609,7 @@ struct MediaInfoView: View { self.aliases = item.aliases self.airdate = item.airdate } - self.episodeLinks = self.sortEpisodes(episodes) + self.episodeLinks = episodes self.isLoading = false self.isRefetching = false } @@ -628,7 +620,7 @@ struct MediaInfoView: View { self.aliases = item.aliases self.airdate = item.airdate } - self.episodeLinks = self.sortEpisodes(episodes) + self.episodeLinks = episodes self.isLoading = false self.isRefetching = false } diff --git a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewGeneral.swift b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewGeneral.swift index 19ca15f..ed21a08 100644 --- a/Sora/Views/SettingsView/SettingsSubViews/SettingsViewGeneral.swift +++ b/Sora/Views/SettingsView/SettingsSubViews/SettingsViewGeneral.swift @@ -16,10 +16,8 @@ struct SettingsViewGeneral: View { @AppStorage("metadataProviders") private var metadataProviders: String = "AniList" @AppStorage("mediaColumnsPortrait") private var mediaColumnsPortrait: Int = 2 @AppStorage("mediaColumnsLandscape") private var mediaColumnsLandscape: Int = 4 - @AppStorage("episodeSortOrder") private var episodeSortOrder: String = "Ascending" private let metadataProvidersList = ["AniList"] - private let sortOrderOptions = ["Ascending", "Descending"] @EnvironmentObject var settings: Settings var body: some View { @@ -52,20 +50,6 @@ struct SettingsViewGeneral: View { } Toggle("Fetch Episode metadata", isOn: $fetchEpisodeMetadata) .tint(.accentColor) - - HStack { - Text("Episode Sort Order") - Spacer() - Menu(episodeSortOrder) { - Button(action: { episodeSortOrder = "Ascending" }) { - Text("Ascending (1-100)") - } - Button(action: { episodeSortOrder = "Descending" }) { - Text("Descending (100-1)") - } - } - } - HStack { Text("Metadata Provider") Spacer()