Create/delete Piped playlists and add/remove videos to Piped playlists

Shared/Playlists/PlaylistFormView.swift

@@ -43,9 +43,12 @@ struct PlaylistFormView: View {
                         TextField("Name", text: $name, onCommit: validate)
                             .frame(maxWidth: 450)
                             .padding(.leading, 10)
+                            .disabled(editing && !accounts.app.userPlaylistsAreEditable)
 
-                        visibilityFormItem
-                            .pickerStyle(.segmented)
+                        if accounts.app.userPlaylistsHaveVisibility {
+                            visibilityFormItem
+                                .pickerStyle(.segmented)
+                        }
                     }
                     #if os(macOS)
                     .padding(.horizontal)
@@ -59,7 +62,7 @@ struct PlaylistFormView: View {
                         Spacer()
 
                         Button("Save", action: submitForm)
-                            .disabled(!valid)
+                            .disabled(!valid || (editing && !accounts.app.userPlaylistsAreEditable))
                             .alert(isPresented: $presentingErrorAlert) {
                                 Alert(
                                     title: Text("Error when accessing playlist"),
@@ -75,7 +78,7 @@ struct PlaylistFormView: View {
                 #if os(iOS)
                 .padding(.vertical)
                 #else
-                .frame(width: 400, height: 150)
+                .frame(width: 400, height: accounts.app.userPlaylistsHaveVisibility ? 150 : 120)
                 #endif
 
             #else
@@ -119,6 +122,7 @@ struct PlaylistFormView: View {
                         .frame(maxWidth: .infinity, alignment: .leading)
 
                     TextField("Playlist Name", text: $name, onCommit: validate)
+                        .disabled(editing && !accounts.app.userPlaylistsAreEditable)
                 }
 
                 HStack {
@@ -132,7 +136,8 @@ struct PlaylistFormView: View {
                 HStack {
                     Spacer()
 
-                    Button("Save", action: submitForm).disabled(!valid)
+                    Button("Save", action: submitForm)
+                        .disabled(!valid || (editing && !accounts.app.userPlaylistsAreEditable))
                 }
                 .padding(.top, 40)
 
@@ -172,27 +177,15 @@ struct PlaylistFormView: View {
             return
         }
 
-        let body = ["title": name, "privacy": visibility.rawValue]
+        accounts.api.playlistForm(name, visibility.rawValue, playlist: playlist, onFailure: { error in
+            formError = "(\(error.httpStatusCode ?? -1)) \(error.userMessage)"
+            presentingErrorAlert = true
+        }) { modifiedPlaylist in
+            self.playlist = modifiedPlaylist
+            playlists.load(force: true)
 
-        resource?
-            .request(editing ? .patch : .post, json: body)
-            .onSuccess { response in
-                if let modifiedPlaylist: Playlist = response.typedContent() {
-                    playlist = modifiedPlaylist
-                }
-
-                playlists.load(force: true)
-
-                presentationMode.wrappedValue.dismiss()
-            }
-            .onFailure { error in
-                formError = "(\(error.httpStatusCode ?? -1)) \(error.userMessage)"
-                presentingErrorAlert = true
-            }
-    }
-
-    var resource: Resource? {
-        editing ? accounts.api.playlist(playlist.id) : accounts.api.playlists
+            presentationMode.wrappedValue.dismiss()
+        }
     }
 
     var visibilityFormItem: some View {
@@ -236,17 +229,14 @@ struct PlaylistFormView: View {
     }
 
     func deletePlaylistAndDismiss() {
-        accounts.api.playlist(playlist.id)?
-            .request(.delete)
-            .onSuccess { _ in
-                playlist = nil
-                playlists.load(force: true)
-                presentationMode.wrappedValue.dismiss()
-            }
-            .onFailure { error in
-                formError = "(\(error.httpStatusCode ?? -1)) \(error.localizedDescription)"
-                presentingErrorAlert = true
-            }
+        accounts.api.deletePlaylist(playlist, onFailure: { error in
+            formError = "(\(error.httpStatusCode ?? -1)) \(error.localizedDescription)"
+            presentingErrorAlert = true
+        }) {
+            playlist = nil
+            playlists.load(force: true)
+            presentationMode.wrappedValue.dismiss()
+        }
     }
 }
 

Shared/Views/PlaylistVideosView.swift

@@ -6,11 +6,28 @@ struct PlaylistVideosView: View {
 
     @Environment(\.inNavigationView) private var inNavigationView
     @EnvironmentObject<PlayerModel> private var player
+    @EnvironmentObject<PlaylistsModel> private var model
 
     @StateObject private var store = Store<ChannelPlaylist>()
 
     var contentItems: [ContentItem] {
-        ContentItem.array(of: playlist.videos.isEmpty ? (store.item?.videos ?? []) : playlist.videos)
+        var videos = playlist.videos
+
+        if videos.isEmpty {
+            videos = store.item?.videos ?? []
+            if !player.accounts.app.userPlaylistsEndpointIncludesVideos {
+                var i = 0
+
+                for index in videos.indices {
+                    var video = videos[index]
+                    video.indexID = "\(i)"
+                    i += 1
+                    videos[index] = video
+                }
+            }
+        }
+
+        return ContentItem.array(of: videos)
     }
 
     private var resource: Resource? {
@@ -33,9 +50,12 @@ struct PlaylistVideosView: View {
             VerticalCells(items: contentItems)
                 .onAppear {
                     if !player.accounts.app.userPlaylistsEndpointIncludesVideos {
-                        resource?.loadIfNeeded()
+                        resource?.load()
                     }
                 }
+                .onChange(of: model.reloadPlaylists) { _ in
+                    resource?.load()
+                }
             #if !os(tvOS)
                 .navigationTitle("\(playlist.title) Playlist")
             #endif

Shared/Views/VideoContextMenuView.swift

@@ -201,7 +201,7 @@ struct VideoContextMenuView: View {
 
     func removeFromPlaylistButton(playlistID: String) -> some View {
         Button {
-            playlists.removeVideo(videoIndexID: video.indexID!, playlistID: playlistID)
+            playlists.removeVideo(index: video.indexID!, playlistID: playlistID)
         } label: {
             Label("Remove from playlist", systemImage: "text.badge.minus")
         }