importer chnges
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
import Foundation
|
||||
import SQLite3
|
||||
|
||||
struct Song: Identifiable, Hashable {
|
||||
struct Song: Identifiable, Hashable, Sendable {
|
||||
var id: Int64
|
||||
var title: String
|
||||
var audio: String
|
||||
@@ -13,6 +13,11 @@ struct Song: Identifiable, Hashable {
|
||||
var label: String = ""
|
||||
var duration: Double = 0
|
||||
var fingerprint: String = ""
|
||||
var trackNumber: String = ""
|
||||
var rendition: String = ""
|
||||
var originalName: String = ""
|
||||
var originalPath: String = ""
|
||||
var trackOrder: Int { Int(trackNumber) ?? 0 }
|
||||
}
|
||||
struct MediaLocation: Identifiable, Hashable, Sendable {
|
||||
var id: Int64
|
||||
@@ -80,6 +85,9 @@ final class Library {
|
||||
try execute("CREATE TABLE IF NOT EXISTS singers(id INTEGER PRIMARY KEY,name TEXT UNIQUE NOT NULL)")
|
||||
try execute("CREATE TABLE IF NOT EXISTS venues(id INTEGER PRIMARY KEY,name TEXT UNIQUE NOT NULL)")
|
||||
try execute("CREATE TABLE IF NOT EXISTS history(id INTEGER PRIMARY KEY,song INTEGER REFERENCES songs(id),singer INTEGER REFERENCES singers(id),venue INTEGER REFERENCES venues(id),played TEXT DEFAULT CURRENT_TIMESTAMP)")
|
||||
for column in ["track_number","rendition","original_name","original_path"] {
|
||||
if try !columns("songs").contains(column) { try execute("ALTER TABLE songs ADD COLUMN \(column) TEXT NOT NULL DEFAULT ''") }
|
||||
}
|
||||
// Additive migration: preserve older libraries and infer existing memberships from history.
|
||||
for column in ["artist", "album", "label"] {
|
||||
if try !columns("songs").contains(column) { try execute("ALTER TABLE songs ADD COLUMN \(column) TEXT NOT NULL DEFAULT ''") }
|
||||
@@ -121,7 +129,8 @@ final class Library {
|
||||
try execute("CREATE TABLE IF NOT EXISTS show_screens(song INTEGER PRIMARY KEY REFERENCES songs(id) ON DELETE CASCADE,body TEXT NOT NULL,footer TEXT NOT NULL,tint TEXT NOT NULL)")
|
||||
try execute("CREATE TABLE IF NOT EXISTS singer_access(venue INTEGER NOT NULL,singer INTEGER NOT NULL,token TEXT NOT NULL UNIQUE,PRIMARY KEY(venue,singer),FOREIGN KEY(venue,singer) REFERENCES venue_singers(venue,singer) ON DELETE CASCADE)")
|
||||
try execute("CREATE TABLE IF NOT EXISTS import_history(path TEXT PRIMARY KEY,signature TEXT NOT NULL,songs TEXT NOT NULL,imported_at TEXT NOT NULL)")
|
||||
try execute("PRAGMA user_version=10")
|
||||
try execute("CREATE TABLE IF NOT EXISTS reinterpret_undo(batch TEXT NOT NULL,song INTEGER NOT NULL REFERENCES songs(id) ON DELETE CASCADE,before_json TEXT NOT NULL,after_json TEXT NOT NULL,edited INTEGER NOT NULL,created TEXT NOT NULL,PRIMARY KEY(batch,song))")
|
||||
try execute("PRAGMA user_version=11")
|
||||
}
|
||||
deinit { sqlite3_close(db) }
|
||||
private func statement(_ sql: String, _ values: [String?]) throws -> OpaquePointer {
|
||||
@@ -139,11 +148,11 @@ final class Library {
|
||||
guard sqlite3_step(s) == SQLITE_DONE else { throw error() }
|
||||
}
|
||||
func songs() throws -> [Song] {
|
||||
let s = try statement("SELECT id,title,audio,cdg,rating,plays,artist,album,label,duration,fingerprint FROM songs ORDER BY title COLLATE NOCASE", []); defer { sqlite3_finalize(s) }
|
||||
let s = try statement("SELECT id,title,audio,cdg,rating,plays,artist,album,label,duration,fingerprint,track_number,rendition,original_name,original_path FROM songs ORDER BY title COLLATE NOCASE", []); defer { sqlite3_finalize(s) }
|
||||
var result = [Song]()
|
||||
while true {
|
||||
let code = sqlite3_step(s); if code == SQLITE_DONE { break }; guard code == SQLITE_ROW else { throw error() }
|
||||
result.append(Song(id: sqlite3_column_int64(s,0), title: String(cString: sqlite3_column_text(s,1)), audio: String(cString: sqlite3_column_text(s,2)), cdg: sqlite3_column_text(s,3).map { String(cString:$0) }, rating: Int(sqlite3_column_int(s,4)), plays: Int(sqlite3_column_int(s,5)), artist: text(s,6), album: text(s,7), label: text(s,8),duration:sqlite3_column_double(s,9),fingerprint:text(s,10)))
|
||||
result.append(Song(id: sqlite3_column_int64(s,0), title: String(cString: sqlite3_column_text(s,1)), audio: String(cString: sqlite3_column_text(s,2)), cdg: sqlite3_column_text(s,3).map { String(cString:$0) }, rating: Int(sqlite3_column_int(s,4)), plays: Int(sqlite3_column_int(s,5)), artist: text(s,6), album: text(s,7), label: text(s,8),duration:sqlite3_column_double(s,9),fingerprint:text(s,10),trackNumber:text(s,11),rendition:text(s,12),originalName:text(s,13),originalPath:text(s,14)))
|
||||
}
|
||||
return result
|
||||
}
|
||||
@@ -339,11 +348,14 @@ final class Library {
|
||||
else { try execute("UPDATE music_stores SET name=?,url=?,search_template=? WHERE id=?",[name,url,search,String(store.id)]) }
|
||||
}
|
||||
func deleteStore(_ id: Int64) throws { try execute("DELETE FROM music_stores WHERE id=?",[String(id)]) }
|
||||
func updateMetadata(song: Int64,title: String,artist: String,album: String,label: String,rating: Int) throws {
|
||||
func updateMetadata(song: Int64,title: String,artist: String,album: String,label: String,rating: Int,trackNumber: String? = nil,rendition: String? = nil) throws {
|
||||
let title = title.trimmingCharacters(in:.whitespacesAndNewlines)
|
||||
guard !title.isEmpty else { throw LibraryError.message("Song title cannot be empty") }
|
||||
if let trackNumber,!trackNumber.isEmpty,trackNumber.count > 3 || !trackNumber.allSatisfy({$0.isASCII && $0.isNumber}) { throw LibraryError.message("Use a track number from 0 to 999, or leave it empty") }
|
||||
try execute("UPDATE songs SET title=?,artist=?,album=?,label=?,rating=?,metadata_edited=1 WHERE id=?",[title,artist.trimmingCharacters(in:.whitespacesAndNewlines),album.trimmingCharacters(in:.whitespacesAndNewlines),label.trimmingCharacters(in:.whitespacesAndNewlines),String(rating),String(song)])
|
||||
guard sqlite3_changes(db) == 1 else { throw LibraryError.message("Song no longer exists") }
|
||||
if let trackNumber { try execute("UPDATE songs SET track_number=? WHERE id=?",[trackNumber,String(song)]) }
|
||||
if let rendition { try execute("UPDATE songs SET rendition=? WHERE id=?",[rendition,String(song)]) }
|
||||
}
|
||||
func tonightSongIDs(venue: Int64?) throws -> [Int64:[Int64]] {
|
||||
guard let venue else { return [:] }
|
||||
@@ -432,9 +444,9 @@ final class Library {
|
||||
try execute("UPDATE media_sources SET path=?,last_scan=?,last_error=? WHERE id=?",[path,ISO8601DateFormatter().string(from:Date()),message,String(source)])
|
||||
}
|
||||
func song(_ id: Int64) throws -> Song? {
|
||||
let s = try statement("SELECT id,title,audio,cdg,rating,plays,artist,album,label,duration,fingerprint FROM songs WHERE id=?",[String(id)]);defer { sqlite3_finalize(s) }
|
||||
let s = try statement("SELECT id,title,audio,cdg,rating,plays,artist,album,label,duration,fingerprint,track_number,rendition,original_name,original_path FROM songs WHERE id=?",[String(id)]);defer { sqlite3_finalize(s) }
|
||||
guard sqlite3_step(s) == SQLITE_ROW else { return nil }
|
||||
return .init(id:sqlite3_column_int64(s,0),title:text(s,1),audio:text(s,2),cdg:sqlite3_column_type(s,3) == SQLITE_NULL ? nil : text(s,3),rating:Int(sqlite3_column_int(s,4)),plays:Int(sqlite3_column_int(s,5)),artist:text(s,6),album:text(s,7),label:text(s,8),duration:sqlite3_column_double(s,9),fingerprint:text(s,10))
|
||||
return .init(id:sqlite3_column_int64(s,0),title:text(s,1),audio:text(s,2),cdg:sqlite3_column_type(s,3) == SQLITE_NULL ? nil : text(s,3),rating:Int(sqlite3_column_int(s,4)),plays:Int(sqlite3_column_int(s,5)),artist:text(s,6),album:text(s,7),label:text(s,8),duration:sqlite3_column_double(s,9),fingerprint:text(s,10),trackNumber:text(s,11),rendition:text(s,12),originalName:text(s,13),originalPath:text(s,14))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -558,3 +570,60 @@ extension Library {
|
||||
return sqlite3_step(query) == SQLITE_ROW ? try song(sqlite3_column_int64(query,0)) : nil
|
||||
}
|
||||
}
|
||||
|
||||
extension Library {
|
||||
func recordOriginalName(song:Int64,name:String,path:String) throws {
|
||||
try execute("UPDATE songs SET original_name=?,original_path=? WHERE id=? AND original_name=''",[name,path,String(song)])
|
||||
}
|
||||
func originalNamesRecorded(_ ids:[Int64]) throws -> Bool {
|
||||
for id in ids { if try song(id)?.originalName.isEmpty != false { return false } };return true
|
||||
}
|
||||
func hasNameUndo() throws -> Bool {
|
||||
let query = try statement("SELECT 1 FROM reinterpret_undo LIMIT 1",[]);defer { sqlite3_finalize(query) };return sqlite3_step(query) == SQLITE_ROW
|
||||
}
|
||||
@discardableResult func reinterpretNames(_ changes:[NameChange]) throws -> Int {
|
||||
let changes = changes.filter{$0.before != $0.after}
|
||||
guard !changes.isEmpty else { return 0 }
|
||||
guard Set(changes.map(\.id)).count == changes.count else { throw LibraryError.message("A song appears more than once in this batch") }
|
||||
let batch = UUID().uuidString,created = ISO8601DateFormatter().string(from:Date())
|
||||
try execute("BEGIN IMMEDIATE")
|
||||
do {
|
||||
for change in changes {
|
||||
guard let current = try song(change.id),NameMetadata(current) == change.before else { throw LibraryError.message("A song changed after the preview. Refresh the preview before applying.") }
|
||||
let query = try statement("SELECT metadata_edited FROM songs WHERE id=?",[String(change.id)])
|
||||
let edited = sqlite3_step(query) == SQLITE_ROW ? sqlite3_column_int(query,0) : 0;sqlite3_finalize(query)
|
||||
let before = String(decoding:try JSONEncoder().encode(change.before),as:UTF8.self),after = String(decoding:try JSONEncoder().encode(change.after),as:UTF8.self)
|
||||
try execute("INSERT INTO reinterpret_undo(batch,song,before_json,after_json,edited,created) VALUES(?,?,?,?,?,?)",[batch,String(change.id),before,after,String(edited),created])
|
||||
try setNameMetadata(change.after,id:change.id,edited:1)
|
||||
}
|
||||
try execute("DELETE FROM reinterpret_undo WHERE batch NOT IN (SELECT batch FROM reinterpret_undo GROUP BY batch ORDER BY MAX(rowid) DESC LIMIT 10)")
|
||||
try execute("COMMIT");return changes.count
|
||||
} catch { try? execute("ROLLBACK");throw error }
|
||||
}
|
||||
@discardableResult func undoNameReinterpretation() throws -> Int {
|
||||
try execute("BEGIN IMMEDIATE")
|
||||
do {
|
||||
let latest = try statement("SELECT batch FROM reinterpret_undo ORDER BY rowid DESC LIMIT 1",[])
|
||||
guard sqlite3_step(latest) == SQLITE_ROW else { sqlite3_finalize(latest);throw LibraryError.message("There is no name reinterpretation to undo") }
|
||||
let batch = text(latest,0);sqlite3_finalize(latest)
|
||||
let query = try statement("SELECT song,before_json,after_json,edited FROM reinterpret_undo WHERE batch=? ORDER BY song",[batch])
|
||||
var rows = [(Int64,NameMetadata,NameMetadata,Int32)]()
|
||||
do {
|
||||
defer { sqlite3_finalize(query) }
|
||||
while sqlite3_step(query) == SQLITE_ROW {
|
||||
let before = try JSONDecoder().decode(NameMetadata.self,from:Data(text(query,1).utf8)),after = try JSONDecoder().decode(NameMetadata.self,from:Data(text(query,2).utf8))
|
||||
rows.append((sqlite3_column_int64(query,0),before,after,sqlite3_column_int(query,3)))
|
||||
}
|
||||
}
|
||||
for (id,before,after,edited) in rows {
|
||||
guard let current = try song(id),NameMetadata(current) == after else { throw LibraryError.message("A song was edited after reinterpretation. Undo would overwrite that edit, so no songs were changed.") }
|
||||
try setNameMetadata(before,id:id,edited:edited)
|
||||
}
|
||||
try execute("DELETE FROM reinterpret_undo WHERE batch=?",[batch]);try execute("COMMIT");return rows.count
|
||||
} catch { try? execute("ROLLBACK");throw error }
|
||||
}
|
||||
private func setNameMetadata(_ value:NameMetadata,id:Int64,edited:Int32) throws {
|
||||
guard !value.title.trimmingCharacters(in:.whitespacesAndNewlines).isEmpty else { throw LibraryError.message("Song title cannot be empty") }
|
||||
try execute("UPDATE songs SET title=?,artist=?,album=?,track_number=?,rendition=?,metadata_edited=? WHERE id=?",[value.title,value.artist,value.album,value.track,value.rendition,String(edited),String(id)])
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user