Feature: Playlists #90

GianniCarlo · 2018-05-13T09:11:08Z

Add Core Data stack
Added new RootViewController which enables us to have the mini player floating across library and playlist VCs
Refactor LibraryViewController into BaseListViewController to be reused for LibraryViewController and PlaylistViewController
Add playlist CRUD functionality
Player working correctly with new data model
Add hash as the Book identifier

TODO:

autoplay for a playlist
handle adding an already existing file directly into a playlist
Add colors extracted from artwork to Book model

Any suggestions are welcome

GianniCarlo · 2018-05-14T06:34:23Z

wops triggered travis, I was preparing another branch with that, but got distracted finishing up the hash thing on this one. I'll get around to it this week

pichfl · 2018-05-13T16:59:23Z

Cartfile

@@ -2,3 +2,4 @@ github "jdg/MBProgressHUD" ~> 0.9.2
 github "cbpowell/MarqueeLabel" ~> 3.1.4
 github "pixelogik/ColorCube" "master"
 github "dennisweissmann/DeviceKit" ~> 1.7
+github "GianniCarlo/SwiftReorder"


Have you considered a PR for this to the upstream repo? I think it will make maintaining this easier in the long run.

I had considered it, but I ran into a problem making the original repo Carthage compatible, since I wanted to try it right away, I brute forced it in my fork recreating the whole project and just adding the library files without the example. There's an improvement besides the addition of the hover/drop callback events, in the original the calculation for the reorder was taking into consideration all the visible cells, when it's only necessary to take into account the adjacent cells. I'll get around to it someday 🤔

pichfl · 2018-05-13T17:00:57Z

BookPlayer/Player/PlayerManager.swift

@@ -11,7 +11,7 @@ import AVFoundation
 import MediaPlayer

 class PlayerManager: NSObject {
-    static let sharedInstance = PlayerManager()
+    static let shared = PlayerManager()


While I welcome this, I wonder if it would be wise to do this in a separate PR, it makes this one quite complex.

pichfl · 2018-05-13T17:09:16Z

BookPlayer/Player/ChaptersViewController.swift

@@ -31,12 +31,13 @@ class ChaptersViewController: UIViewController {

 extension ChaptersViewController: UITableViewDataSource {
    func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
-        return self.book.chapters.count
+        return self.book.chapters!.count


I think we'll have to update this for the future, passing only a list of chapters into the ChaptersViewController as this VC does not need to have knowledge of a book.

However when playlists are at play, we should consider showing a section per file in the playlist, so maybe we need to pass an list of lists here? Maybe there is a more appropriate data structure for this than simple arrays.

pichfl · 2018-05-13T17:24:19Z

BookPlayer/Models/Playlist+CoreDataClass.swift

+    convenience init(title: String, books: [Book], context: NSManagedObjectContext) {
+        let entity = NSEntityDescription.entity(forEntityName: "Playlist", in: context)!
+        self.init(entity: entity, insertInto: context)
+        self.identifier = title


That does not feel like a sound solution. The title will most likely be editable in the future. Use a UUID if an identifier beyond the objectID which I don't think should be necessary.

So I think we can simply drop the identifier completely here.

I do understand it's used in the PlayerManager for legacy reasons, but we should remove it's usage there as well as CoreData objects can be compared in a much more direct way than we were able to with the previous approach.

I didn't see this comment. that init is only called when the book is created for the first time, after its content is processed and the hash generated, the identifier is updated to reflect the hash. Mmmm this could be reworked, and instead of creating the book and comparing with the existing ones, I could just compare the hash that I'll be getting anyway 🤔

pichfl · 2018-05-13T17:46:05Z

BookPlayer/Models/Book+CoreDataClass.swift

+
+public class Book: LibraryItem {
+    var fileURL: URL!
+    var asset: AVAsset!


I know this will be quite a task, but do we actually need to retain the asset here?

We only need the asset to read the meta data which in turn will be stored into our data model. After that we only need the asset that is currently played. I assume that should reduce the number of assets kept in memory.

valid point, this can be reworked definitely

pichfl · 2018-05-13T18:06:23Z

BookPlayer/Player/PlayerManager.swift

@@ -102,6 +104,18 @@ class PlayerManager: NSObject {
        }

        self.currentBook.currentTime = audioplayer.currentTime
+        let percentage = round(self.currentBook.currentTime / self.currentBook.duration * 100)


I'd rather consolidate any percentage calculations in one place as in the previous Book model and move the notification there.

noted. We can make the percentage a getter property then, because we can't have a didSet for currentTime since it's a managedObject

pichfl · 2018-05-13T18:13:05Z

BookPlayer/Models/Chapter+CoreDataProperties.swift

+    @NSManaged public var start: Double
+    @NSManaged public var duration: Double
+    @NSManaged public var index: Int16
+    @NSManaged public var book: Book?


Is ? necessary here? Is there any chance a chapter could be created without a book?

generated stubs from CoreData. I'll change it in code and see if it breaks

pichfl · 2018-05-13T18:53:22Z

BookPlayer/Player/PlayerViewController.swift

@@ -99,14 +99,14 @@ class PlayerViewController: UIViewController, UIGestureRecognizerDelegate {
        self.metaViewController?.book = currentBook
        self.controlsViewController?.book = currentBook
        self.progressViewController?.book = currentBook
-        self.progressViewController?.currentTime = UserDefaults.standard.double(forKey: currentBook.identifier)
+        self.progressViewController?.currentTime = currentBook.currentTime


We don't need to set this separately any more, this can be moved to the didSet in the PlayerProgressViewController.

pichfl · 2018-05-13T18:54:56Z

BookPlayer/Player/PlayerViewController.swift

@@ -120,11 +120,15 @@ class PlayerViewController: UIViewController, UIGestureRecognizerDelegate {
        let blur = UIBlurEffect(style: colors.isDark ? UIBlurEffectStyle.dark : UIBlurEffectStyle.light)
        let blurView = UIVisualEffectView(effect: blur)

-        blurView.frame = backgroundImage.frame
+//        blurView.frame = backgroundImage.bounds


I think the comments can be dropped, having the constraints works for me as well.

pichfl · 2018-05-13T18:59:19Z

BookPlayer/Player/ChaptersViewController.swift

@@ -57,7 +58,7 @@ extension ChaptersViewController: UITableViewDataSource {
 extension ChaptersViewController: UITableViewDelegate {
    func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
        // Don't set the chapter, set the new time which will set the chapter in didSet
-        PlayerManager.shared.jumpTo(self.book.chapters[indexPath.row].start)
+        PlayerManager.shared.jumpTo((self.book.chapters![indexPath.row] as! Chapter).start)


That are quite some ! for a single line, maybe guard?

…fy build script

…ectly

GianniCarlo · 2018-05-17T04:18:51Z

merged! 🎉

GianniCarlo requested a review from pichfl May 13, 2018 09:11

GianniCarlo mentioned this pull request May 13, 2018

Change sharedInstance for shared in PlayerManager (more swifty) #91

Merged

GianniCarlo force-pushed the feature/playlist branch from d51237b to e408283 Compare May 13, 2018 18:29

GianniCarlo mentioned this pull request May 13, 2018

Feature: Playlists #14

Closed

3 tasks

pichfl reviewed May 14, 2018

View reviewed changes

pichfl changed the title ~~WIP: Feature/playlist~~ Feature: Playlists May 15, 2018

pichfl added this to the v3.0.0 milestone May 15, 2018

GianniCarlo force-pushed the feature/playlist branch from 2a958d5 to c28f42c Compare May 16, 2018 05:56

GianniCarlo added 16 commits May 16, 2018 23:15

Add CoreData models

99a30a0

Make playback work again with new data models

98ad588

Add reorder of books and new section 'add', remove pull down to refresh

c672963

Move route and audio interruption notifications to AppDelegate & modi…

ab53bae

…fy build script

Fix percentage in library and use LibraryItem class for data source

723f454

Add creation of playlists to LibraryVC

dd01b80

Create superclass BaseListVC for LibraryVC and PlaylistVC

effc279

Handle delete playlists correctly, & enable add files to playlist dir…

01feac9

…ectly

Refactor books into having a hash as the identifier

b1c698d

Fix usesDefaultArtwork flag

e04bffe

Fix review comments, remove asset, rename artworkImage

932d1c6

Add artwork colors to data model

2bb9e97

Handle adding existing book directly into a playlist

bc5fb37

set automatic autoplay for playlists

42ce31d

Adapt chapter handler to model & fix tap to support

abdd978

Refactor processing files

c96d69f

GianniCarlo force-pushed the feature/playlist branch from c28f42c to c96d69f Compare May 17, 2018 04:17

GianniCarlo merged commit cc6a5ce into next/major May 17, 2018

This was referenced May 17, 2018

Use checksum or hash of file as identifier #64

Closed

Store extracted artwork colors #76

Closed

New layout for Library #46

Closed

GianniCarlo deleted the feature/playlist branch June 9, 2018 22:45

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature: Playlists #90

Feature: Playlists #90

GianniCarlo commented May 13, 2018 •

edited

Loading

GianniCarlo commented May 14, 2018

pichfl May 13, 2018

GianniCarlo May 14, 2018

pichfl May 13, 2018

pichfl May 13, 2018

pichfl May 13, 2018

GianniCarlo May 16, 2018

pichfl May 13, 2018

GianniCarlo May 14, 2018

pichfl May 13, 2018

GianniCarlo May 14, 2018

pichfl May 13, 2018

GianniCarlo May 14, 2018

pichfl May 13, 2018

pichfl May 13, 2018

pichfl May 13, 2018

GianniCarlo May 14, 2018

GianniCarlo commented May 17, 2018

Feature: Playlists #90

Feature: Playlists #90

Conversation

GianniCarlo commented May 13, 2018 • edited Loading

GianniCarlo commented May 14, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

GianniCarlo commented May 17, 2018

GianniCarlo commented May 13, 2018 •

edited

Loading