removed unwanted bar now with waveforms, major updates and enhancements
This commit is contained in:
+63
-14
@@ -26,6 +26,9 @@ struct Importer {
|
||||
var audioExtensions: Set<String> = ["mp3","wav","m4a","mp4","m4v","mov"]
|
||||
var includeGraphics = true
|
||||
var waveformCache: URL? = nil
|
||||
var continueOnUnreadableAudio = false
|
||||
var metadataTimeout: TimeInterval = 2
|
||||
var metadataLoader: (@Sendable (URL) async throws -> [AVMetadataKey:String])? = nil
|
||||
@discardableResult func run(_ urls: [URL],library: Library,copyMedia: Bool = true,cancelled: () -> Bool = { false },progress: (ImportProgress) -> Void = { _ in }) throws -> [Int64] {
|
||||
if copyMedia { try ManagedMediaStorage.prepare(media) }
|
||||
var state = ImportProgress()
|
||||
@@ -73,6 +76,7 @@ struct Importer {
|
||||
}
|
||||
} else if values.isRegularFile == true,supported.contains(url.pathExtension.lowercased()) {
|
||||
discovered.insert(url)
|
||||
report("Scanning · \(discovered.count.formatted()) supported files found · \(url.lastPathComponent)")
|
||||
}
|
||||
} catch is CancellationError { throw CancellationError() }
|
||||
catch { throw LibraryError.message("Could not scan \(url.path): \(error.localizedDescription)") }
|
||||
@@ -85,7 +89,10 @@ struct Importer {
|
||||
// Older libraries may contain indexed tracks without stored fingerprints.
|
||||
// Compare only same-size candidates, and hash each legacy file at most once.
|
||||
var legacyBySize = [UInt64:[Song]]()
|
||||
var existingChecked = 0
|
||||
for song in try library.songs() where song.fingerprint.isEmpty {
|
||||
if cancelled() { throw CancellationError() }
|
||||
existingChecked += 1;report("Checking existing library · \(existingChecked.formatted()) tracks · \(song.title)")
|
||||
if let info = try? FileManager.default.attributesOfItem(atPath:song.audio),let size = info[.size] as? NSNumber,size.uint64Value > 0 {
|
||||
legacyBySize[size.uint64Value,default:[]].append(song)
|
||||
}
|
||||
@@ -222,9 +229,24 @@ struct Importer {
|
||||
state.logLines.append("[SKIPPED] "+sourcePath(audio)+" (already imported)")
|
||||
report("Already imported: "+audio.lastPathComponent,force:state.completed == 1);continue
|
||||
}
|
||||
guard MediaByteCopy.nonempty(audio) else { throw LibraryError.message("Audio file is empty or unreadable: "+audio.path) }
|
||||
let hash = try audioFingerprint(audio,cancelled:cancelled)
|
||||
let graphicsHash = try cdg.map { try audioFingerprint($0,cancelled:cancelled) }
|
||||
let hash: String
|
||||
let graphicsHash: String?
|
||||
do {
|
||||
guard MediaByteCopy.nonempty(audio) else { throw LibraryError.message("Audio file is empty or unreadable: "+audio.path) }
|
||||
report("Checking audio: "+audio.lastPathComponent)
|
||||
if continueOnUnreadableAudio { _ = try AVAudioFile(forReading:audio) }
|
||||
hash = try audioFingerprint(audio,cancelled:cancelled,progress:{ bytes in
|
||||
report("Reading "+audio.lastPathComponent+" · "+ByteCountFormatter.string(fromByteCount:bytes,countStyle:.file))
|
||||
})
|
||||
graphicsHash = try cdg.map { try audioFingerprint($0,cancelled:cancelled) }
|
||||
} catch is CancellationError { throw CancellationError() }
|
||||
catch {
|
||||
guard continueOnUnreadableAudio else { throw error }
|
||||
state.completed += 1;state.skipped += 1
|
||||
state.logLines.append("[SKIPPED] "+sourcePath(audio)+" (unreadable audio: "+error.localizedDescription+")")
|
||||
report("Skipped unreadable file: "+audio.lastPathComponent,force:state.completed == 1)
|
||||
continue
|
||||
}
|
||||
let duplicate = try duplicateWithFingerprint(hash,audio:audio)
|
||||
var sameGraphics = cdg == nil
|
||||
if let graphicsHash,let stored = duplicate?.cdg,FileManager.default.fileExists(atPath:stored) {
|
||||
@@ -238,7 +260,10 @@ struct Importer {
|
||||
report("Already in library: "+audio.lastPathComponent,force:state.completed == 1);continue
|
||||
}
|
||||
let dest = copy ? media.appendingPathComponent(hash+"."+audio.pathExtension.lowercased()) : audio.standardizedFileURL
|
||||
if copy { try MediaByteCopy.copy(audio,to:dest,expectedHash:hash,cancelled:cancelled) }
|
||||
if copy {
|
||||
report("Copying: "+audio.lastPathComponent)
|
||||
try MediaByteCopy.copy(audio,to:dest,expectedHash:hash,cancelled:cancelled)
|
||||
}
|
||||
var graphics: String?
|
||||
if let cdg {
|
||||
let target = copy ? media.appendingPathComponent(hash+"-"+(graphicsHash ?? "graphics")+".cdg") : cdg.standardizedFileURL
|
||||
@@ -246,12 +271,25 @@ struct Importer {
|
||||
graphics = target.path
|
||||
}
|
||||
imported += 1
|
||||
report("Reading tags: "+audio.lastPathComponent,force:imported == 1)
|
||||
let metadata = try audioMetadata(audio,cancelled:cancelled)
|
||||
func tag(_ key: AVMetadataKey) -> String { metadata[key] ?? "" }
|
||||
if metadata == nil { state.logLines.append("[WARNING] "+sourcePath(audio)+" (tag read timed out; imported using its filename)") }
|
||||
func tag(_ key: AVMetadataKey) -> String { metadata?[key] ?? "" }
|
||||
let taggedTitle = tag(.commonKeyTitle)
|
||||
let id = try library.add(title:taggedTitle.isEmpty ? audio.deletingPathExtension().lastPathComponent : taggedTitle,audio:dest.path,cdg:graphics,artist:tag(.commonKeyArtist),album:tag(.commonKeyAlbumName),label:tag(.commonKeyPublisher),duration:audioDuration(audio),fingerprint:hash,preferIncomingFile:copy)
|
||||
let duration = audioDuration(audio)
|
||||
report("Saving track: "+audio.lastPathComponent)
|
||||
try library.execute("SAVEPOINT kjmix_import_track")
|
||||
let id: Int64
|
||||
do {
|
||||
id = try library.add(title:taggedTitle.isEmpty ? audio.deletingPathExtension().lastPathComponent : taggedTitle,audio:dest.path,cdg:graphics,artist:tag(.commonKeyArtist),album:tag(.commonKeyAlbumName),label:tag(.commonKeyPublisher),duration:duration,fingerprint:hash,preferIncomingFile:copy)
|
||||
try remember(audio,signature,id)
|
||||
try library.execute("RELEASE SAVEPOINT kjmix_import_track")
|
||||
} catch {
|
||||
try? library.execute("ROLLBACK TO SAVEPOINT kjmix_import_track")
|
||||
try? library.execute("RELEASE SAVEPOINT kjmix_import_track")
|
||||
throw error
|
||||
}
|
||||
songIDs.insert(id)
|
||||
try remember(audio,signature,id)
|
||||
state.completed += 1
|
||||
state.logLines.append("[IMPORTED] "+sourcePath(audio))
|
||||
if let waveformCache {
|
||||
@@ -274,29 +312,40 @@ struct Importer {
|
||||
state.finished = true;report("Import complete",force:true)
|
||||
return Array(songIDs)
|
||||
}
|
||||
private func audioFingerprint(_ url: URL,cancelled: () -> Bool) throws -> String {
|
||||
private func audioFingerprint(_ url: URL,cancelled: () -> Bool,progress: (Int64) -> Void = {_ in}) throws -> String {
|
||||
let file = try FileHandle(forReadingFrom:url);defer { try? file.close() }
|
||||
var hasher = SHA256()
|
||||
while let data = try file.read(upToCount:1_048_576),!data.isEmpty { if cancelled() { throw CancellationError() };hasher.update(data:data) }
|
||||
var bytes: Int64 = 0
|
||||
while true {
|
||||
if cancelled() { throw CancellationError() }
|
||||
guard let data = try file.read(upToCount:1_048_576),!data.isEmpty else { break }
|
||||
hasher.update(data:data);bytes += Int64(data.count);progress(bytes)
|
||||
}
|
||||
return hasher.finalize().map { String(format:"%02x",$0) }.joined()
|
||||
}
|
||||
/// The importer runs on its worker queue. Bridge asynchronous tag loading here
|
||||
/// so the existing synchronous transaction can retain its cancellation semantics.
|
||||
private func audioMetadata(_ url: URL,cancelled: () -> Bool) throws -> [AVMetadataKey:String] {
|
||||
private func audioMetadata(_ url: URL,cancelled: () -> Bool) throws -> [AVMetadataKey:String]? {
|
||||
if cancelled() { throw CancellationError() }
|
||||
let result = ImportMetadataResult(),ready = DispatchSemaphore(value:0)
|
||||
let asset = AVURLAsset(url:url),loader = metadataLoader
|
||||
let task = Task.detached(priority:.utility) {
|
||||
defer { ready.signal() }
|
||||
if let loader { result.set((try? await loader(url)) ?? [:]);return }
|
||||
var tags = [AVMetadataKey:String]()
|
||||
let items = (try? await AVURLAsset(url:url).load(.commonMetadata)) ?? []
|
||||
let items = (try? await asset.load(.commonMetadata)) ?? []
|
||||
for item in items {
|
||||
if Task.isCancelled { break }
|
||||
guard let key = item.commonKey,[AVMetadataKey.commonKeyTitle,.commonKeyArtist,.commonKeyAlbumName,.commonKeyPublisher].contains(key),tags[key] == nil else { continue }
|
||||
if let value = try? await item.load(.stringValue) { tags[key] = value }
|
||||
}
|
||||
result.set(tags);ready.signal()
|
||||
result.set(tags)
|
||||
}
|
||||
defer { task.cancel() }
|
||||
while ready.wait(timeout:.now()+0.05) == .timedOut {
|
||||
defer { task.cancel();asset.cancelLoading() }
|
||||
let deadline = ProcessInfo.processInfo.systemUptime+max(0.01,metadataTimeout)
|
||||
while ready.wait(timeout:.now()+0.02) == .timedOut {
|
||||
if cancelled() { throw CancellationError() }
|
||||
if ProcessInfo.processInfo.systemUptime >= deadline { return nil }
|
||||
}
|
||||
if cancelled() { throw CancellationError() }
|
||||
return result.get()
|
||||
|
||||
Reference in New Issue
Block a user