cranci1 · cranci1 · Jan 11, 2025 · Jan 5, 2025 · Jan 5, 2025 · Jan 5, 2025
diff --git a/README.md b/README.md
@@ -28,16 +28,16 @@ A modular web scraping app, **Still in early builds** under the GPLv3.0 License
 ## Frequently Asked Questions
 
 1. **What is Sora?**
-   - Sora is a module based web scraping app, made to work with modules only
+   - Sora is a modular web scraping app designed to work exclusively with modules.
 
 2. **Is Sora safe?**
    - Yes, Sora is open-source and does not store user data on external servers.
 
 3. **Will Sora ever be paid?**
-   - No, Sora will always remain free without subscriptions, paid content, or any type of login.
+   - No, Sora will always remain free, with no subscriptions, paid content, or required logins.
 
-4. **How can i get module?**
-   - I do not provide any module for the app. Search for them on google or i dont know. I only created 1 module to watch videos of my school.
+4. **Where can I get modules?**
+   - I do not provide any modules for the app. Search for them on google or elsewhere. I only created 1 module to watch videos of my school.
 
 ## Acknowledgements
 

diff --git a/Sora.xcodeproj/project.pbxproj b/Sora.xcodeproj/project.pbxproj
diff --git a/Sora.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/Sora.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
diff --git a/...eproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate b/...eproj/project.xcworkspace/xcuserdata/Francesco.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Sora.xcodeproj/xcuserdata/Francesco.xcuserdatad/xcschemes/xcschememanagement.plist b/Sora.xcodeproj/xcuserdata/Francesco.xcuserdatad/xcschemes/xcschememanagement.plist
diff --git a/Sora/Assets.xcassets/AccentColor.colorset/.DS_Store b/Sora/Assets.xcassets/AccentColor.colorset/.DS_Store
diff --git a/Sora/ContentView.swift b/Sora/ContentView.swift
@@ -2,14 +2,13 @@
 //  ContentView.swift
 //  Sora
 //
-//  Created by Francesco on 18/12/24.
+//  Created by Francesco on 06/01/25.
 //
 
 import SwiftUI
+import Kingfisher
 
 struct ContentView: View {
-    @EnvironmentObject var modulesManager: ModulesManager
-
     var body: some View {
         TabView {
             HomeView()
@@ -26,93 +25,8 @@ struct ContentView: View {
                 }
             SettingsView()
                 .tabItem {
-                    Label("Settings", systemImage: "gearshape")
+                    Label("Settings", systemImage: "gear")
                 }
         }
-        .onAppear {
-            checkForUpdate()
-            Logger.shared.log("Started Sora")
-        }
-    }
-
-    func checkForUpdate() {
-        fetchLatestRelease { release in
-            guard let release = release else { return }
-
-            let latestVersion = release.tagName
-            let currentVersion = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as? String ?? "0.1.1"
-
-            if latestVersion.compare(currentVersion, options: .numeric) == .orderedDescending {
-                DispatchQueue.main.async {
-                    showUpdateAlert(release: release)
-                }
-            }
-        }
-    }
-
-    func fetchLatestRelease(completion: @escaping (GitHubRelease?) -> Void) {
-        let url = URL(string: "https://api.github.com/repos/cranci1/Sora/releases/latest")!
-
-        URLSession.custom.dataTask(with: url) { data, _, error in
-            guard let data = data, error == nil else {
-                completion(nil)
-                return
-            }
-
-            let release = try? JSONDecoder().decode(GitHubRelease.self, from: data)
-            completion(release)
-        }.resume()
-    }
-
-    func showUpdateAlert(release: GitHubRelease) {
-        let alert = UIAlertController(title: "Update Available", message: "A new version (\(release.tagName)) is available. Would you like to update Sora?", preferredStyle: .alert)
-
-        alert.addAction(UIAlertAction(title: "Update", style: .default, handler: { _ in
-            self.showInstallOptionsAlert(release: release)
-        }))
-
-        alert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-
-        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-           let rootViewController = windowScene.windows.first?.rootViewController {
-            rootViewController.present(alert, animated: true, completion: nil)
-        }
-    }
-
-    func showInstallOptionsAlert(release: GitHubRelease) {
-        let installAlert = UIAlertController(title: "Install Update", message: "Choose an installation method:", preferredStyle: .alert)
-
-        let downloadUrl = release.assets.first?.browserDownloadUrl ?? ""
-
-        installAlert.addAction(UIAlertAction(title: "Install in AltStore", style: .default, handler: { _ in
-            if let url = URL(string: "altstore://install?url=\(downloadUrl)") {
-                UIApplication.shared.open(url)
-            }
-        }))
-
-        installAlert.addAction(UIAlertAction(title: "Install in Sidestore", style: .default, handler: { _ in
-            if let url = URL(string: "sidestore://install?url=\(downloadUrl)") {
-                UIApplication.shared.open(url)
-            }
-        }))
-
-        installAlert.addAction(UIAlertAction(title: "Open in Safari", style: .default, handler: { _ in
-            if let url = URL(string: downloadUrl) {
-                UIApplication.shared.open(url)
-            }
-        }))
-
-        installAlert.addAction(UIAlertAction(title: "Cancel", style: .cancel, handler: nil))
-
-        if let windowScene = UIApplication.shared.connectedScenes.first as? UIWindowScene,
-           let rootViewController = windowScene.windows.first?.rootViewController {
-            rootViewController.present(installAlert, animated: true, completion: nil)
-        }
-    }
-}
-
-struct ContentView_Previews: PreviewProvider {
-    static var previews: some View {
-        ContentView()
     }
 }
diff --git a/Sora/Info.plist b/Sora/Info.plist
@@ -2,22 +2,10 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-	<key>CFBundleURLTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeRole</key>
-			<string>Editor</string>
-			<key>CFBundleURLName</key>
-			<string>me.cranci.scheme</string>
-			<key>CFBundleURLSchemes</key>
-			<array>
-				<string>ryu</string>
-			</array>
-		</dict>
-	</array>
-	<key>UIBackgroundModes</key>
-	<array>
-		<string>audio</string>
-	</array>
+	<key>NSAppTransportSecurity</key>
+	<dict>
+		<key>NSAllowsArbitraryLoads</key>
+		<true/>
+	</dict>
 </dict>
 </plist>
diff --git a/...mPlayer/Components/Double+Extension.swift → ...mPlayer/Components/Double+Extension.swift b/...mPlayer/Components/Double+Extension.swift → ...mPlayer/Components/Double+Extension.swift
diff --git a/...ayer/Components/MusicProgressSlider.swift → ...ayer/Components/MusicProgressSlider.swift b/...ayer/Components/MusicProgressSlider.swift → ...ayer/Components/MusicProgressSlider.swift
diff --git a/Sora/Utils/CustomPlayer/CustomPlayer.swift → ...diaPlayer/CustomPlayer/CustomPlayer.swift b/Sora/Utils/CustomPlayer/CustomPlayer.swift → ...diaPlayer/CustomPlayer/CustomPlayer.swift
@@ -32,22 +32,24 @@ struct CustomMediaPlayer: View {
     @State private var showControls = false
     @State private var inactivityTimer: Timer?
     @State private var timeObserverToken: Any?
+    @State private var isVideoLoaded = false
+    @State private var showWatchNextButton = true
     @Environment(\.presentationMode) var presentationMode
 
-    let module: ModuleStruct
+    let module: ScrapingModule
     let fullUrl: String
     let title: String
     let episodeNumber: Int
     let onWatchNext: () -> Void
 
-    init(module: ModuleStruct, urlString: String, fullUrl: String, title: String, episodeNumber: Int, onWatchNext: @escaping () -> Void) {
+    init(module: ScrapingModule, urlString: String, fullUrl: String, title: String, episodeNumber: Int, onWatchNext: @escaping () -> Void) {
         guard let url = URL(string: urlString) else {
             fatalError("Invalid URL string")
         }
 
         var request = URLRequest(url: url)
         if urlString.contains("ascdn") {
-            request.addValue("\(module.module[0].details.baseURL)", forHTTPHeaderField: "Referer")
+            request.addValue("\(module.metadata.baseUrl)", forHTTPHeaderField: "Referer")
         }
 
         let asset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": request.allHTTPHeaderFields ?? [:]])
@@ -76,6 +78,7 @@ struct CustomMediaPlayer: View {
                                 currentTime = time.seconds
                                 if let itemDuration = player.currentItem?.duration.seconds, itemDuration.isFinite && !itemDuration.isNaN {
                                     duration = itemDuration
+                                    isVideoLoaded = true
                                 }
                             }
                             startUpdatingCurrentTime()
@@ -152,7 +155,7 @@ struct CustomMediaPlayer: View {
                                     .padding(.horizontal, 32)
                                 }
                                 Spacer()
-                                if duration - currentTime <= duration * 0.10 && currentTime != duration {
+                                if duration - currentTime <= duration * 0.10 && currentTime != duration && showWatchNextButton {
                                     Button(action: {
                                         player.pause()
                                         presentationMode.wrappedValue.dismiss()
@@ -170,6 +173,13 @@ struct CustomMediaPlayer: View {
                                         .cornerRadius(32)
                                     }
                                     .padding(.trailing, 10)
+                                    .onAppear {
+                                        if UserDefaults.standard.bool(forKey: "hideNextButton") {
+                                            DispatchQueue.main.asyncAfter(deadline: .now() + 5) {
+                                                showWatchNextButton = false
+                                            }
+                                        }
+                                    }
                                 }
                                 if showControls {
                                     Menu {
@@ -203,13 +213,14 @@ struct CustomMediaPlayer: View {
                                     emptyColor: .white.opacity(0.3),
                                     height: 28,
                                     onEditingChanged: { editing in
-                                        if !editing {
+                                        if !editing && isVideoLoaded {
                                             player.seek(to: CMTime(seconds: currentTime, preferredTimescale: 600))
                                         }
                                     }
                                 )
                                     .padding(.horizontal, 32)
                                     .padding(.bottom, 10)
+                                    .disabled(!isVideoLoaded)
                             }
                         }
                     }

diff --git a/Sora/Utils/Player/NormalPlayer.swift → Sora/MediaPlayer/NormalPlayer.swift b/Sora/Utils/Player/NormalPlayer.swift → Sora/MediaPlayer/NormalPlayer.swift
diff --git a/Sora/Utils/Player/VideoPlayerView.swift → Sora/MediaPlayer/VideoPlayer.swift b/Sora/Utils/Player/VideoPlayerView.swift → Sora/MediaPlayer/VideoPlayer.swift
@@ -1,23 +1,23 @@
 //
-//  VideoPlayerView.swift
+//  VideoPlayer.swift
 //  Sora
 //
-//  Created by Francesco on 18/12/24.
+//  Created by Francesco on 09/01/25.
 //
 
 import UIKit
 import AVKit
 
 class VideoPlayerViewController: UIViewController {
-    let module: ModuleStruct
+    let module: ScrapingModule
 
     var player: AVPlayer?
-    var playerViewController: AVPlayerViewController?
+    var playerViewController: NormalPlayer?
     var timeObserverToken: Any?
     var streamUrl: String?
     var fullUrl: String = ""
 
-    init(module: ModuleStruct) {
+    init(module: ScrapingModule) {
         self.module = module
         super.init(nibName: nil, bundle: nil)
     }
@@ -35,7 +35,7 @@ class VideoPlayerViewController: UIViewController {
 
         var request = URLRequest(url: url)
         if streamUrl.contains("ascdn") {
-            request.addValue("\(module.module[0].details.baseURL)", forHTTPHeaderField: "Referer")
+            request.addValue("\(module.metadata.baseUrl)", forHTTPHeaderField: "Referer")
         }
 
         let asset = AVURLAsset(url: url, options: ["AVURLAssetHTTPHeaderFieldsKey": request.allHTTPHeaderFields ?? [:]])

diff --git a/Sora/Sora.entitlements b/Sora/Sora.entitlements