Remember folder

Coldwave.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		8723BCF32A78C706007BC8FF /* LocationView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8723BCF22A78C706007BC8FF /* LocationView.swift */; };
 		F823C8CB2709C06E00CB6F31 /* AlbumCoverView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F823C8CA2709C06E00CB6F31 /* AlbumCoverView.swift */; };
 		F823C8CD2709CBA500CB6F31 /* PlaybackControlView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F823C8CC2709CBA500CB6F31 /* PlaybackControlView.swift */; };
 		F84AB2DB269329D400D69D4F /* ColdwaveApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = F84AB2DA269329D400D69D4F /* ColdwaveApp.swift */; };
@@ -37,6 +38,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		8723BCF22A78C706007BC8FF /* LocationView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LocationView.swift; sourceTree = "<group>"; };
 		F823C8CA2709C06E00CB6F31 /* AlbumCoverView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AlbumCoverView.swift; sourceTree = "<group>"; };
 		F823C8CC2709CBA500CB6F31 /* PlaybackControlView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PlaybackControlView.swift; sourceTree = "<group>"; };
 		F84AB2D7269329D400D69D4F /* Coldwave.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Coldwave.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -110,6 +112,7 @@
 				F86C1E3A270C476600D602A6 /* SearchView.swift */,
 				F86C1E3C270C8F5800D602A6 /* ColdwaveState.swift */,
 				F86C1E3E270CA5B200D602A6 /* SingleAlbumView.swift */,
+				8723BCF22A78C706007BC8FF /* LocationView.swift */,
 			);
 			path = Coldwave;
 			sourceTree = "<group>";
@@ -202,6 +205,7 @@
 				F86C1E3D270C8F5800D602A6 /* ColdwaveState.swift in Sources */,
 				F823C8CB2709C06E00CB6F31 /* AlbumCoverView.swift in Sources */,
 				F84AB2FC26934D5000D69D4F /* ContentView.swift in Sources */,
+				8723BCF32A78C706007BC8FF /* LocationView.swift in Sources */,
 				F823C8CD2709CBA500CB6F31 /* PlaybackControlView.swift in Sources */,
 				F86C1E3F270CA5B200D602A6 /* SingleAlbumView.swift in Sources */,
 			);
@@ -341,7 +345,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.1;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = abyrd.Coldwave;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -364,7 +368,7 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 11.1;
+				MACOSX_DEPLOYMENT_TARGET = 11.0;
 				PRODUCT_BUNDLE_IDENTIFIER = abyrd.Coldwave;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

Coldwave/Album.swift

@@ -20,7 +20,7 @@ class Album: Identifiable, Equatable {
     init (_ albumFullPath: String) {
         albumPath = albumFullPath
         let fileManager = FileManager.default
-        let contents = try! fileManager.contentsOfDirectory(atPath: albumFullPath)
+        let contents = try! fileManager.contentsOfDirectory(atPath: albumFullPath).sorted()
         for file in contents as [String] {
             var isDir: ObjCBool = false;
             let lcFile = file.lowercased()
@@ -94,7 +94,7 @@ class Album: Identifiable, Equatable {
     // Return an array of URLs, one for each music file in this album's folder.
     func getPlaylist () -> [URL] {
         let fileManager = FileManager.default
-        let contents = try! fileManager.contentsOfDirectory(atPath: albumPath)
+        let contents = try! fileManager.contentsOfDirectory(atPath: albumPath).sorted()
         var musicFileURLs: [URL] = []
         for file in contents as [String] {
             let lcFile = file.lowercased()

Coldwave/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -21,21 +21,25 @@
       "size" : "32x32"
     },
     {
+      "filename" : "AppIcon128x128.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "128x128"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "128x128"
     },
     {
+      "filename" : "AppIcon256x256.png",
       "idiom" : "mac",
       "scale" : "1x",
       "size" : "256x256"
     },
     {
+      "filename" : "[email protected]",
       "idiom" : "mac",
       "scale" : "2x",
       "size" : "256x256"

Coldwave/Coldwave.entitlements

@@ -2,9 +2,13 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.app-sandbox</key>
-    <true/>
-    <key>com.apple.security.files.user-selected.read-only</key>
-    <true/>
+	<key>com.apple.security.app-sandbox</key>
+	<true/>
+	<key>com.apple.security.assets.music.read-only</key>
+	<true/>
+	<key>com.apple.security.files.downloads.read-only</key>
+	<true/>
+	<key>com.apple.security.files.user-selected.read-only</key>
+	<true/>
 </dict>
 </plist>

Coldwave/ColdwaveApp.swift

@@ -2,9 +2,13 @@ import SwiftUI
 
 @main
 struct ColdwaveApp: App {
-
+    @NSApplicationDelegateAdaptor(AppDelegate.self) var appDelegate
+
     @StateObject var state: ColdwaveState = ColdwaveState()
 
+    // Only available in macOS 13.0 and later
+    //@Environment(\.openWindow) private var openWindow
+
     var body: some Scene {
         WindowGroup {
             ContentView(state: state)
@@ -13,6 +17,11 @@ struct ColdwaveApp: App {
             CommandGroup(before: CommandGroupPlacement.newItem) {
                 Button(action: { openFolder() }, label: { Label("Open directory...", systemImage: "doc") })
                     .keyboardShortcut("o")
+
+                /*
+                Button(action: { openWindow(id: "open-location") }, label: { Label("Open location...", systemImage: "doc")})
+                    .keyboardShortcut("l")
+                 */
             }
             CommandMenu("Utilities") {
                 Button("Bigger") {
@@ -23,8 +32,14 @@ struct ColdwaveApp: App {
                 }.keyboardShortcut("-")
             }
         }
+
+        /*
+        Window("Open location", id: "open-location") {
+            LocationView()
+        }.windowResizability(.contentSize)
+         */
     }
-    
+
     private func openFolder () {
         let dialog = NSOpenPanel();
         dialog.title                   = "Choose root music directory | ABCD";
@@ -44,3 +59,27 @@ struct ColdwaveApp: App {
     }
 
 }
+
+final class AppDelegate: NSObject, NSApplicationDelegate {
+    func applicationDidFinishLaunching(_ notification: Notification) {
+        let unwantedMenus = ["Edit","View"  ]
+
+        let removeMenus = {
+            unwantedMenus.forEach {
+                guard let menu = NSApp.mainMenu?.item(withTitle: $0) else { return }
+                NSApp.mainMenu?.removeItem(menu)
+            }
+        }
+
+        NotificationCenter.default.addObserver(
+            forName: NSMenu.didAddItemNotification,
+            object: nil,
+            queue: .main
+        ) { _ in
+            // Must refresh after every time SwiftUI re adds
+            removeMenus()
+        }
+
+        removeMenus()
+    }
+}

Coldwave/ColdwaveState.swift

@@ -1,17 +1,21 @@
 import Foundation
 import AVFoundation
+import SwiftUI
 
 class ColdwaveState: ObservableObject {
-
+
+    @AppStorage("music.folder") var path = ""
     @Published var albums: [Album] = []
-    @Published var path: String = "";
+    //@Published var path = "";
     @Published var currentAlbum: Album?
     @Published var currentTrack = 0
     @Published var coverSize: CGFloat = DEFAULT_IMAGE_SIZE
     @Published var playlist: [URL]  = []
     @Published var amountPlayed: Double = 0.0 // in range 0...1
     @Published var playing: Bool = false
     @Published var searchText: String = ""
+    @Published var timePlayed = 0
+    @Published var timeRemaining = 0
 
     let player: AVPlayer = AVPlayer()
 
@@ -24,10 +28,17 @@ class ColdwaveState: ObservableObject {
             // converting the track duration units to match the amountPlayed units.
             if let duration = self.player.currentItem?.duration.convertScale(t.timescale, method: CMTimeRoundingMethod.default) {
                 self.amountPlayed = Double(t.value) / Double(duration.value)
+                self.timePlayed = Int(t.seconds)
+                let d = duration.seconds
+                self.timeRemaining = d.isNaN ? 0 : Int(d - t.seconds)
             }
         }
+
+        if path != "" {
+            albums = Album.scanLibrary(at: path)
+        }
     }
-    
+
     // It doesn't seem clean to put this (or the AVPlayer) on the state, but notification
     // targets have to be objc functions which have to be members of an NSObject or protocol.
     // I could probably factor the player field and these methods out into another class.
@@ -68,12 +79,11 @@ class ColdwaveState: ObservableObject {
         player.pause()
         playing = false
     }
-    
+
     func play () {
         if (player.currentItem != nil) {
             player.play()
             playing = true
         }
     }
-
 }

Coldwave/LocationView.swift

@@ -0,0 +1,41 @@
+//
+//  LocationView.swift
+//  Coldwave
+//
+//  Created by Raffaele Sena on 7/31/23.
+//
+
+import SwiftUI
+
+struct LocationView: View {
+    // Only available in macOS 12.0 or later
+    //@Environment(\.dismiss) private var dismiss
+    @State private var location : String = ""
+
+    var body: some View {
+        VStack {
+            HStack {
+                Text("Location:")
+                TextField("Enter location of audio file, stream or playlist", text: $location)
+            }
+            HStack {
+                 Button("Cancel") {
+                    location = ""
+                    //dismiss()
+                }
+                Button("Open") {
+                    print(location)
+                    //dismiss()
+                }
+            }
+            .frame(maxWidth: .infinity, alignment: .trailing)
+        }
+        .padding(.all)
+    }
+}
+
+struct LocationView_Previews: PreviewProvider {
+    static var previews: some View {
+        LocationView()
+    }
+}

Coldwave/PlaybackControlView.swift

@@ -39,7 +39,7 @@ struct PlaybackControlView: View {
                     }.id(trackIndex)
                 }
             }
-        }.padding(PADDING)
+        }.padding(.horizontal)
         // When slider is moved, trailing closure is called with true, then false when released.
         // Dragging is quite unresponsive, maybe because the UI is recomputed when state changes.
         Slider(value: $state.amountPlayed, in: 0...1) {editing in
@@ -49,8 +49,12 @@ struct PlaybackControlView: View {
                     state.player.seek(to: CMTimeMake(value: Int64(newPosition), timescale: d.timescale))
                 }
             }
-        }.padding(PADDING)
-        // Text(String(state.amountPlayed))
+        }.padding(.horizontal)
+        HStack {
+            Text(mmss(seconds: state.timePlayed))
+            Spacer()
+            Text(mmss(seconds: state.timeRemaining))
+        }.padding(.horizontal).padding(.bottom)
     }
 
     private func mmss (seconds: Int) -> String {