Channels caching

Model/Cache/BaseCacheModel.swift

@@ -14,6 +14,7 @@ struct BaseCacheModel {
         [
             FeedCacheModel.shared,
             VideosCacheModel.shared,
+            ChannelsCacheModel.shared,
             PlaylistsCacheModel.shared,
             ChannelPlaylistsCacheModel.shared,
             SubscribedChannelsModel.shared

Model/Cache/ChannelsCacheModel.swift

@@ -0,0 +1,46 @@
+import Cache
+import Foundation
+import Logging
+import SwiftyJSON
+
+struct ChannelsCacheModel: CacheModel {
+    static let shared = ChannelsCacheModel()
+    let logger = Logger(label: "stream.yattee.cache.channels")
+
+    static let diskConfig = DiskConfig(name: "channels")
+    static let memoryConfig = MemoryConfig()
+
+    let storage = try? Storage<String, JSON>(
+        diskConfig: Self.diskConfig,
+        memoryConfig: Self.memoryConfig,
+        transformer: BaseCacheModel.jsonTransformer
+    )
+
+    func store(_ channel: Channel) {
+        guard channel.hasExtendedDetails else {
+            logger.warning("not caching \(channel.cacheKey)")
+            return
+        }
+
+        logger.info("caching \(channel.cacheKey)")
+        try? storage?.setObject(channel.json, forKey: channel.cacheKey)
+    }
+
+    func storeIfMissing(_ channel: Channel) {
+        guard let storage, !storage.objectExists(forKey: channel.cacheKey) else {
+            return
+        }
+
+        store(channel)
+    }
+
+    func retrieve(_ cacheKey: String) -> Channel? {
+        logger.info("retrieving cache for \(cacheKey)")
+
+        if let json = try? storage?.object(forKey: cacheKey) {
+            return Channel.from(json)
+        }
+
+        return nil
+    }
+}

Model/Cache/SubscribedChannelsModel.swift

@@ -69,6 +69,7 @@ final class SubscribedChannelsModel: ObservableObject, CacheModel {
                 .onSuccess { resource in
                     if let channels: [Channel] = resource.typedContent() {
                         self.channels = channels
+                        channels.forEach { ChannelsCacheModel.shared.storeIfMissing($0) }
                         self.storeChannels(account: account, channels: channels)
                         FeedModel.shared.calculateUnwatchedFeed()
                         onSuccess()
@@ -93,6 +94,8 @@ final class SubscribedChannelsModel: ObservableObject, CacheModel {
         let date = iso8601DateFormatter.string(from: Date())
         logger.info("caching channels \(channelsDateCacheKey(account)) -- \(date)")
 
+        channels.forEach { ChannelsCacheModel.shared.storeIfMissing($0) }
+
         let dateObject: JSON = ["date": date]
         let channelsObject: JSON = ["channels": channels.map(\.json).map(\.object)]
 
@@ -106,7 +109,16 @@ final class SubscribedChannelsModel: ObservableObject, CacheModel {
         if let json = try? storage?.object(forKey: channelsCacheKey(account)),
            let channels = json.dictionaryValue["channels"]
         {
-            return channels.arrayValue.map { Channel.from($0) }
+            return channels.arrayValue.map { json in
+                let channel = Channel.from(json)
+                if !channel.hasExtendedDetails,
+                   let cache = ChannelsCacheModel.shared.retrieve(channel.cacheKey)
+                {
+                    return cache
+                }
+
+                return channel
+            }
         }
 
         return []

Model/Cache/VideosCacheModel.swift

@@ -19,6 +19,8 @@ struct VideosCacheModel: CacheModel {
     func storeVideo(_ video: Video) {
         logger.info("caching \(video.cacheKey)")
         try? storage?.setObject(video.json, forKey: video.cacheKey)
+
+        ChannelsCacheModel.shared.storeIfMissing(video.channel)
     }
 
     func retrieveVideo(_ cacheKey: String) -> Video? {