Added screenshots to README

Fixed some unit tests

Author: iComputerfreak

Movie DB/CSV/CSVHelper.swift

@@ -13,6 +13,7 @@ import Foundation
 struct CSVHelper {
     private init() {}
 
+    // TODO: Make async and use continuation to return the result (or throw an error)
     static func importMediaObjects(
         csvString: String,
         importContext: NSManagedObjectContext,

Movie DB/CoreData/Model/Media/Media+CoreDataClass.swift

@@ -21,16 +21,18 @@ public class Media: NSManagedObject {
 
     // Loads the poster thumbnail in the background and assigns it to this media's thumbnail property
     func loadThumbnail(force: Bool = false) async {
-        guard force || managedObjectContext?.performAndWait({ self.thumbnail }) == nil else {
-            // Thumbnail already present, don't load/download again, unless force parameter is given
+        guard
+            let managedObjectContext,
+            force || managedObjectContext.performAndWait({ self.thumbnail }) == nil
+        else {
+            // Thumbnail already present or no context, don't load/download again, unless force parameter is given
             return
         }
         do {
-            let mediaID = managedObjectContext?.performAndWait { self.id }
-            let imagePath = managedObjectContext?.performAndWait { self.imagePath }
+            let mediaID = managedObjectContext.performAndWait { self.id }
+            let imagePath = managedObjectContext.performAndWait { self.imagePath }
             let thumbnail = try await PosterService.shared.thumbnail(for: mediaID, imagePath: imagePath, force: force)
-            assert(self.managedObjectContext != nil)
-            self.managedObjectContext?.performAndWait {
+            managedObjectContext.performAndWait {
                 self.objectWillChange.send()
                 self.thumbnail = thumbnail
             }
@@ -115,8 +117,8 @@ public class Media: NSManagedObject {
         print("[\(title)] Awaking from insert")
         tags = []
         // Use `setPrimitiveValue` to avoid sending notifications
-        setPrimitiveValue(Date(), forKey: "creationDate")
-        setPrimitiveValue(Date(), forKey: "modificationDate")
+        self.creationDate = .now
+        self.modificationDate = .now
     }
 
     override public func willSave() {

Movie DB/Utility/PlaceholderData.swift

@@ -33,24 +33,27 @@ enum PlaceholderData {
         return s
     }()
 
-    static let allTags: [Tag] = [
-        Tag(name: "Future", context: context),
-        Tag(name: "Conspiracy", context: context),
-        Tag(name: "Dark", context: context),
-        Tag(name: "Violent", context: context),
-        Tag(name: "Gangsters", context: context),
-        Tag(name: "Terrorist", context: context),
-        Tag(name: "Past", context: context),
-        Tag(name: "Fantasy", context: context),
-    ]
+    static func mapTags(_ tagNames: [String], in context: NSManagedObjectContext) -> Set<Tag> {
+        var tags: Set<Tag> = []
+        for name in tagNames {
+            let fetchRequest = Tag.fetchRequest()
+            fetchRequest.predicate = NSPredicate(format: "name = %@", name)
+            if let tag = try? context.fetch(fetchRequest).first {
+                // Use the existing tag
+                tags.insert(tag)
+            } else {
+                // Create a new one
+                tags.insert(Tag(name: name, context: context))
+            }
+        }
+        return tags
+    }
 
-    // swiftlint:disable:next function_body_length
-    static func createMovie() -> Movie {
+    static func createMovie(in context: NSManagedObjectContext = context) -> Movie {
         let tmdbData: TMDBData = Self.load("Matrix.json", mediaType: .movie, into: context)
         let m = Movie(context: context, tmdbData: tmdbData)
         m.personalRating = .twoAndAHalfStars
-        m.tags = Set(["Future", "Conspiracy", "Dark"]
-            .map { name in allTags.first(where: { $0.name == name })! })
+        m.tags = mapTags(["Future", "Conspiracy", "Dark"], in: context)
         m.notes = ""
         m.watched = .watched
         m.watchAgain = false
@@ -109,12 +112,11 @@ enum PlaceholderData {
         return m
     }
 
-    static func createShow() -> Show {
+    static func createShow(in context: NSManagedObjectContext = context) -> Show {
         let tmdbData: TMDBData = Self.load("Blacklist.json", mediaType: .show, into: context)
         let s = Show(context: context, tmdbData: tmdbData)
         s.personalRating = .fiveStars
-        s.tags = Set(["Gangsters", "Conspiracy", "Terrorist"]
-            .map { name in allTags.first(where: { $0.name == name })! })
+        s.tags = mapTags(["Gangsters", "Conspiracy", "Terrorist"], in: context)
         s.notes = "A masterpiece!"
         s.watched = .season(7)
         s.watchAgain = true

Movie DBTests/CSVCoderTests.swift

@@ -100,9 +100,15 @@ class CSVCoderTests: XCTestCase {
         try await Task.sleep(for: .seconds(3))
 
         // MARK: Decode
-        let expectation = XCTestExpectation(description: "Decode CSV")
+        let expectation = expectation(description: "Decode CSV")
         let disposableContext = PersistenceController.createDisposableContext()
-        CSVHelper.importMediaObjects(csvString: csv, importContext: disposableContext) { mediaObjects, _ in
+        CSVHelper.importMediaObjects(csvString: csv, importContext: disposableContext) { _ in
+            // onProgress
+        } onFail: { importLog in
+            XCTFail("CSVHelper failed importing the media objects.")
+            print(importLog.joined(separator: "\n"))
+            expectation.fulfill()
+        } onFinish: { mediaObjects, _ in
             do {
                 XCTAssertEqual(mediaObjects.count, samples.count)
 
@@ -138,12 +144,11 @@ class CSVCoderTests: XCTestCase {
             } catch {
                 XCTFail(error.localizedDescription)
             }
-            // Fulfill the expectation.
             expectation.fulfill()
         }
 
         // Wait for decoding tests to finish
-        wait(for: [expectation], timeout: 10.0)
+        await waitForExpectations(timeout: 20)
     }
 
     // Compares if two dates by comparing their ISO8601 representation
@@ -203,7 +208,7 @@ class CSVCoderTests: XCTestCase {
             XCTAssertEqual(data[.isAdult], movie.isAdult.description)
         } else if let show = media as? Show {
             // Show exclusive
-            XCTAssertEqual(data[.lastSeasonWatched], show.watched?.season?.description ?? "")
+            XCTAssertEqual(data[.lastSeasonWatched], show.watched?.season.description ?? "")
             XCTAssertEqual(data[.lastEpisodeWatched], show.watched?.episode?.description ?? "")
             if let firstAirDate = show.firstAirDate {
                 XCTAssertEqual(data[.firstAirDate], CSVManager.dateFormatter.string(from: firstAirDate))

Movie DBTests/PredicateTests.swift

@@ -30,40 +30,36 @@ class PredicateTests: XCTestCase {
     }
 
     func testNewSeasonsAvailablePredicate() throws {
-        let predicateCompletelyWatched = NSCompoundPredicate(type: .and, subpredicates: [
+        let predicateNotCompletelyWatched = NSCompoundPredicate(type: .and, subpredicates: [
             NSPredicate(format: "type = %@", MediaType.show.rawValue),
             NSPredicate(format: "lastSeasonWatched > 0 AND lastSeasonWatched < numberOfSeasons"),
         ])
 
-        PlaceholderData.context.reset()
+        let media1 = PlaceholderData.createShow(in: testingUtils.context)
+        media1.title = "Media 1"
+        media1.numberOfSeasons = 11
+        media1.watched = .season(11)
 
-        let matchingMedia1 = PlaceholderData.createShow()
-        matchingMedia1.title = "Media 1"
-        matchingMedia1.numberOfSeasons = 11
-        matchingMedia1.watched = .season(11)
+        let media2 = PlaceholderData.createShow(in: testingUtils.context)
+        media2.title = "Media 2"
+        media2.numberOfSeasons = 1
+        media2.watched = .season(11)
 
-        let matchingMedia2 = PlaceholderData.createShow()
-        matchingMedia2.title = "Media 2"
-        matchingMedia2.numberOfSeasons = 1
-        matchingMedia2.watched = .season(11)
-        
-        let nonMatchingMedia = PlaceholderData.createShow()
-        nonMatchingMedia.title = "Media 3"
-        nonMatchingMedia.numberOfSeasons = 11
-        nonMatchingMedia.watched = .season(1)
+        let media3 = PlaceholderData.createShow(in: testingUtils.context)
+        media3.title = "Media 3"
+        media3.numberOfSeasons = 11
+        media3.watched = .season(1)
 
         let fetchRequest = Media.fetchRequest()
-        fetchRequest.predicate = predicateCompletelyWatched
+        fetchRequest.predicate = predicateNotCompletelyWatched
         fetchRequest.sortDescriptors = [NSSortDescriptor(key: "title", ascending: true)]
-        let results = try PlaceholderData.context.fetch(fetchRequest)
+        let results = try testingUtils.context.fetch(fetchRequest)
 
-        XCTAssertEqual(results.map(\.title), [matchingMedia1.title, matchingMedia2.title])
+        XCTAssertEqual(results.map(\.title), [media3.title])
     }
 
     func testAnyPredicate() throws {
-        PlaceholderData.context.reset()
-        
-        let show = PlaceholderData.createShow()
+        let show = PlaceholderData.createShow(in: testingUtils.context)
         show.watched = .season(1)
         show.numberOfSeasons = 2
 
@@ -75,7 +71,7 @@ class PredicateTests: XCTestCase {
 
         let fetchRequest: NSFetchRequest<Show> = Show.fetchRequest()
         fetchRequest.predicate = predicate
-        let results = try PlaceholderData.context.fetch(fetchRequest)
+        let results = try testingUtils.context.fetch(fetchRequest)
         XCTAssertEqual(results.count, 1)
         print(results)
     }

README.md

@@ -5,6 +5,15 @@ An app to keep track of all the movies and shows you watched.
 
 **Download now via [TestFlight](https://testflight.apple.com/join/yI9GMaOD)!**
 
+<p align="center">
+  <img src="./readme_images/01_Library.png" width="16%" />
+  <img src="./readme_images/02_AddMedia.png" width="16%" />
+  <img src="./readme_images/03_Lists.png" width="16%" />
+  <img src="./readme_images/04_Watchlist.png" width="16%" />
+  <img src="./readme_images/05_ListConfiguration.png" width="16%" />
+  <img src="./readme_images/06_Settings.png" width="16%" />
+</p>
+
 
 ## Features
 * Add movies and tv shows from TheMovieDB.org to your library