Improve listing

Model/DataProvider.swift

@@ -5,7 +5,7 @@ class DataProvider: ObservableObject {
     static let instance = "https://invidious.home.arekf.net"
 
     static func request(_ path: String) -> DataRequest {
-        return AF.request(apiURLString(path))
+        AF.request(apiURLString(path))
     }
 
     static func apiURLString(_ path: String) -> String {

Model/Video.swift

@@ -2,20 +2,26 @@ import Alamofire
 import Foundation
 import SwiftyJSON
 
-class Video: Identifiable, ObservableObject {
+final class Video: Identifiable, ObservableObject {
     let id: String
     var title: String
     var thumbnailURL: URL
     var author: String
+    var length: TimeInterval
+    var published: String
+    var views: Int
 
     @Published var url: URL?
     @Published var error: Bool = false
 
-    init(id: String, title: String, thumbnailURL: URL, author: String) {
+    init(id: String, title: String, thumbnailURL: URL, author: String, length: TimeInterval, published: String, views: Int = 0) {
         self.id = id
         self.title = title
         self.thumbnailURL = thumbnailURL
         self.author = author
+        self.length = length
+        self.published = published
+        self.views = views
     }
 
     init(_ json: JSON) {
@@ -23,6 +29,10 @@ class Video: Identifiable, ObservableObject {
         title = json["title"].stringValue
         thumbnailURL = json["videoThumbnails"][0]["url"].url!
         author = json["author"].stringValue
+        length = json["lengthSeconds"].doubleValue
+        published = json["publishedText"].stringValue
+        views = json["viewCount"].intValue
+
         url = formatStreamURL(from: json["formatStreams"].arrayValue)
     }
 
@@ -36,4 +46,33 @@ class Video: Identifiable, ObservableObject {
 
         return stream["url"].url
     }
+
+    var playTime: String? {
+        let formatter = DateComponentsFormatter()
+
+        formatter.unitsStyle = .positional
+        formatter.allowedUnits = length >= (60 * 60) ? [.hour, .minute, .second] : [.minute, .second]
+        formatter.zeroFormattingBehavior = [.pad]
+
+        return formatter.string(from: length)
+    }
+
+    var viewsCount: String {
+        let formatter = NumberFormatter()
+        formatter.numberStyle = .decimal
+        formatter.maximumFractionDigits = 1
+
+        var number: NSNumber
+        var unit: String
+
+        if views < 1_000_000 {
+            number = NSNumber(value: Double(views) / 1000.0)
+            unit = "K"
+        } else {
+            number = NSNumber(value: Double(views) / 1_000_000.0)
+            unit = "M"
+        }
+
+        return "\(formatter.string(from: number)!)\(unit)"
+    }
 }