Merge of DownloadManager with upstream/develop

Core/Core/Analytics/CoreAnalytics.swift

@@ -128,7 +128,9 @@ public enum AnalyticsEvent: String {
     case courseViewCertificateClicked = "Course:View Certificate Clicked"
     case bulkDownloadVideosToggle = "Video:Bulk Download Toggle"
     case bulkDownloadVideosSubsection = "Video:Bulk Download Subsection"
+    case bulkDownloadVideosSection = "Video:Bulk Download Section"
     case bulkDeleteVideosSubsection = "Videos:Delete Subsection Videos"
+    case bulkDeleteVideosSection = "Videos:Delete Section Videos"
     case videoLoaded = "Video:Loaded"
     case videoSpeedChange = "Video:Change Speed"
     case videoPlayed = "Video:Played"
@@ -204,6 +206,8 @@ public enum EventBIValue: String {
     case bulkDownloadVideosToggle = "edx.bi.app.videos.download.toggle"
     case bulkDownloadVideosSubsection = "edx.bi.video.subsection.bulkdownload"
     case bulkDeleteVideosSubsection = "edx.bi.app.video.delete.subsection"
+    case bulkDownloadVideosSection = "edx.bi.video.section.bulkdownload"
+    case bulkDeleteVideosSection = "edx.bi.app.video.delete.section"
     case videoLoaded = "edx.bi.app.videos.loaded"
     case videoSpeedChange = "edx.bi.app.videos.speed.changed"
     case videoPlayed = "edx.bi.app.videos.played"

Core/Core/Data/Persistence/CoreDataModel.xcdatamodeld/CoreDataModel.xcdatamodel/contents

@@ -1,11 +1,12 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22758" systemVersion="23F79" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="23605" systemVersion="24A335" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
     <entity name="CDDownloadData" representedClassName="CDDownloadData" syncable="YES" codeGenerationType="class">
+        <attribute name="actualSize" optional="YES" attributeType="Integer 64" defaultValueString="0" usesScalarValueType="YES"/>
         <attribute name="blockId" optional="YES" attributeType="String"/>
         <attribute name="courseId" optional="YES" attributeType="String"/>
         <attribute name="displayName" optional="YES" attributeType="String"/>
         <attribute name="fileName" optional="YES" attributeType="String"/>
-        <attribute name="fileSize" optional="YES" attributeType="Integer 32" defaultValueString="0.0" usesScalarValueType="YES"/>
+        <attribute name="fileSize" optional="YES" attributeType="Integer 64" defaultValueString="0.0" usesScalarValueType="YES"/>
         <attribute name="id" optional="YES" attributeType="String"/>
         <attribute name="lastModified" optional="YES" attributeType="String"/>
         <attribute name="progress" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>

Core/Core/Data/Persistence/CorePersistenceProtocol.swift

@@ -13,44 +13,39 @@ public protocol CorePersistenceProtocol: Sendable {
     func set(userId: Int)
     func getUserID() -> Int?
     @MainActor func publisher() throws -> AnyPublisher<Int, Never>
-    func addToDownloadQueue(tasks: [DownloadDataTask]) async
+    func addToDownloadQueue(tasks: [DownloadDataTask])
     func saveOfflineProgress(progress: OfflineProgress) async
     func loadProgress(for blockID: String) async -> OfflineProgress?
     func loadAllOfflineProgress() async -> [OfflineProgress]
     func deleteProgress(for blockID: String) async
     func deleteAllProgress() async
 
-    func addToDownloadQueue(blocks: [CourseBlock], downloadQuality: DownloadQuality) async
-    func nextBlockForDownloading() async -> DownloadDataTask?
-    func updateDownloadState(id: String, state: DownloadState, resumeData: Data?) async
-    func deleteDownloadDataTask(id: String) async throws
-    func saveDownloadDataTask(_ task: DownloadDataTask) async
+    func addToDownloadQueue(blocks: [CourseBlock], downloadQuality: DownloadQuality)
+    func updateTask(task: DownloadDataTask)
     func downloadDataTask(for blockId: String) async -> DownloadDataTask?
     func getDownloadDataTasks() async -> [DownloadDataTask]
     func getDownloadDataTasksForCourse(_ courseId: String) async -> [DownloadDataTask]
+    func deleteDownloadDataTasks(ids: [String])
 }
 
 #if DEBUG
 public final class CorePersistenceMock: CorePersistenceProtocol, @unchecked Sendable {
-
     public init() {}
     public func set(userId: Int) {}
     public func getUserID() -> Int? {1}
     public func publisher() -> AnyPublisher<Int, Never> { Just(0).eraseToAnyPublisher() }
-    public func addToDownloadQueue(blocks: [CourseBlock], downloadQuality: DownloadQuality) async {}
-    public func addToDownloadQueue(tasks: [DownloadDataTask]) async {}
-    public func nextBlockForDownloading() async -> DownloadDataTask? { nil }
-    public func updateDownloadState(id: String, state: DownloadState, resumeData: Data?) async {}
-    public func deleteDownloadDataTask(id: String) async throws {}
+    public func addToDownloadQueue(blocks: [CourseBlock], downloadQuality: DownloadQuality) {}
+    public func addToDownloadQueue(tasks: [DownloadDataTask]) {}
+    public func updateTask(task: DownloadDataTask) {}
     public func downloadDataTask(for blockId: String) async -> DownloadDataTask? { nil }
     public func saveOfflineProgress(progress: OfflineProgress) async {}
     public func loadProgress(for blockID: String) async -> OfflineProgress? { nil }
     public func loadAllOfflineProgress() async -> [OfflineProgress] { [] }
     public func deleteProgress(for blockID: String) async {}
     public func deleteAllProgress() async {}
-    public func saveDownloadDataTask(_ task: DownloadDataTask) async {}
     public func getDownloadDataTasks() async -> [DownloadDataTask] {[]}
     public func getDownloadDataTasksForCourse(_ courseId: String) async -> [DownloadDataTask] {[]}
+    public func deleteDownloadDataTasks(ids: [String]) {}
 }
 #endif
 

Core/Core/Domain/Model/CourseBlockModel.swift

@@ -269,16 +269,13 @@ public struct CourseBlock: Hashable, Identifiable, Sendable, Equatable {
     public let encodedVideo: CourseBlockEncodedVideo?
     public let multiDevice: Bool?
     public var offlineDownload: OfflineDownload?
-    public var actualFileSize: Int?
 
     public var isDownloadable: Bool {
         encodedVideo?.isDownloadable ?? false || offlineDownload?.isDownloadable ?? false
     }
 
     public var fileSize: Int? {
-        if let actualFileSize {
-            return actualFileSize
-        } else if let fileSize = encodedVideo?.desktopMP4?.fileSize {
+        if let fileSize = encodedVideo?.desktopMP4?.fileSize {
             return fileSize
         } else if let fileSize = encodedVideo?.fallback?.fileSize {
             return fileSize