add macOS app shell with sidebar library, reader, click-to-play
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
71
Vorleser-macOS/MacLibraryView.swift
Normal file
71
Vorleser-macOS/MacLibraryView.swift
Normal file
@@ -0,0 +1,71 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
import Storage
|
||||
import BookParser
|
||||
|
||||
struct MacLibraryView: View {
|
||||
@Environment(\.modelContext) private var modelContext
|
||||
@Query(sort: \StoredBook.lastRead, order: .reverse) private var books: [StoredBook]
|
||||
@State private var selectedBook: StoredBook?
|
||||
@State private var showFileImporter = false
|
||||
|
||||
private var bookStore: BookStore {
|
||||
BookStore(
|
||||
modelContainer: modelContext.container,
|
||||
documentsDirectory: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
|
||||
)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
NavigationSplitView {
|
||||
List(books, selection: $selectedBook) { book in
|
||||
VStack(alignment: .leading) {
|
||||
Text(book.title).font(.headline)
|
||||
if let author = book.author {
|
||||
Text(author).font(.subheadline).foregroundStyle(.secondary)
|
||||
}
|
||||
}
|
||||
.tag(book)
|
||||
.contextMenu {
|
||||
Button("Delete", role: .destructive) {
|
||||
try? bookStore.deleteBook(book)
|
||||
}
|
||||
}
|
||||
}
|
||||
.navigationTitle("Library")
|
||||
.toolbar {
|
||||
Button("Import", systemImage: "plus") {
|
||||
showFileImporter = true
|
||||
}
|
||||
}
|
||||
.fileImporter(
|
||||
isPresented: $showFileImporter,
|
||||
allowedContentTypes: [.epub, .plainText],
|
||||
allowsMultipleSelection: false
|
||||
) { result in
|
||||
handleImport(result)
|
||||
}
|
||||
} detail: {
|
||||
if let selectedBook {
|
||||
MacReaderView(storedBook: selectedBook)
|
||||
} else {
|
||||
ContentUnavailableView("Select a Book", systemImage: "book", description: Text("Choose a book from the sidebar or import one."))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private func handleImport(_ result: Result<[URL], Error>) {
|
||||
guard case .success(let urls) = result, let url = urls.first else { return }
|
||||
guard url.startAccessingSecurityScopedResource() else { return }
|
||||
defer { url.stopAccessingSecurityScopedResource() }
|
||||
|
||||
Task {
|
||||
do {
|
||||
let parsed = try BookParser.parse(url: url)
|
||||
try bookStore.importBook(from: url, title: parsed.title, author: parsed.author)
|
||||
} catch {
|
||||
print("Import failed: \(error)")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
46
Vorleser-macOS/MacPlaybackControls.swift
Normal file
46
Vorleser-macOS/MacPlaybackControls.swift
Normal file
@@ -0,0 +1,46 @@
|
||||
import SwiftUI
|
||||
import class AudioEngine.AudioEngine
|
||||
import enum AudioEngine.PlaybackState
|
||||
|
||||
struct MacPlaybackControls: View {
|
||||
@Bindable var engine: AudioEngine
|
||||
|
||||
var body: some View {
|
||||
HStack(spacing: 32) {
|
||||
Button(action: { engine.skipBackward() }) {
|
||||
Image(systemName: "backward.fill")
|
||||
.font(.title2)
|
||||
}
|
||||
.disabled(engine.state == .idle)
|
||||
|
||||
Button(action: togglePlayback) {
|
||||
Image(systemName: playButtonIcon)
|
||||
.font(.title)
|
||||
}
|
||||
|
||||
Button(action: { engine.skipForward() }) {
|
||||
Image(systemName: "forward.fill")
|
||||
.font(.title2)
|
||||
}
|
||||
.disabled(engine.state == .idle)
|
||||
}
|
||||
.padding()
|
||||
}
|
||||
|
||||
private var playButtonIcon: String {
|
||||
switch engine.state {
|
||||
case .playing: "pause.fill"
|
||||
case .synthesizing: "hourglass"
|
||||
case .paused: "play.fill"
|
||||
case .idle: "play.fill"
|
||||
}
|
||||
}
|
||||
|
||||
private func togglePlayback() {
|
||||
switch engine.state {
|
||||
case .playing: engine.pause()
|
||||
case .paused: engine.resume()
|
||||
default: break
|
||||
}
|
||||
}
|
||||
}
|
||||
129
Vorleser-macOS/MacReaderView.swift
Normal file
129
Vorleser-macOS/MacReaderView.swift
Normal file
@@ -0,0 +1,129 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
import Storage
|
||||
import BookParser
|
||||
import class AudioEngine.AudioEngine
|
||||
import enum AudioEngine.PlaybackState
|
||||
import class Synthesizer.Synthesizer
|
||||
import struct Synthesizer.VoicePack
|
||||
import VorleserKit
|
||||
|
||||
struct MacReaderView: View {
|
||||
let storedBook: StoredBook
|
||||
@State private var book: Book?
|
||||
@State private var error: String?
|
||||
@State private var engine = AudioEngine()
|
||||
@State private var synthesizer: Synthesizer?
|
||||
@State private var selectedChapterIndex: Int = 0
|
||||
@Environment(\.modelContext) private var modelContext
|
||||
|
||||
private var bookStore: BookStore {
|
||||
BookStore(
|
||||
modelContainer: modelContext.container,
|
||||
documentsDirectory: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0]
|
||||
)
|
||||
}
|
||||
|
||||
var body: some View {
|
||||
VStack {
|
||||
if let error {
|
||||
ContentUnavailableView("Error", systemImage: "exclamationmark.triangle", description: Text(error))
|
||||
} else if let book {
|
||||
chapterPicker(book: book)
|
||||
readingContent(book: book)
|
||||
MacPlaybackControls(engine: engine)
|
||||
} else {
|
||||
ProgressView("Loading…")
|
||||
}
|
||||
}
|
||||
.navigationTitle(storedBook.title)
|
||||
.task { await loadBook() }
|
||||
.onDisappear {
|
||||
engine.stop()
|
||||
try? bookStore.updatePosition(storedBook, position: engine.currentPosition)
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func chapterPicker(book: Book) -> some View {
|
||||
if book.chapters.count > 1 {
|
||||
Picker("Chapter", selection: $selectedChapterIndex) {
|
||||
ForEach(book.chapters, id: \.index) { chapter in
|
||||
Text(chapter.title).tag(chapter.index)
|
||||
}
|
||||
}
|
||||
.pickerStyle(.menu)
|
||||
.padding(.horizontal)
|
||||
}
|
||||
}
|
||||
|
||||
@ViewBuilder
|
||||
private func readingContent(book: Book) -> some View {
|
||||
let chapter = book.chapters[selectedChapterIndex]
|
||||
let highlightRange = currentSentenceRange(in: book)
|
||||
|
||||
MacReadingTextView(
|
||||
text: chapter.text,
|
||||
highlightedRange: highlightRange,
|
||||
onClickCharacter: { localOffset in
|
||||
let globalOffset = globalOffset(forLocalOffset: localOffset, in: book)
|
||||
Task {
|
||||
try await startPlayback(from: globalOffset, book: book)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private func loadBook() async {
|
||||
let fileURL = bookStore.fileURL(for: storedBook)
|
||||
guard bookStore.fileExists(for: storedBook) else {
|
||||
error = "Book file is missing. Please re-import."
|
||||
return
|
||||
}
|
||||
do {
|
||||
self.book = try BookParser.parse(url: fileURL)
|
||||
if let book, storedBook.lastPosition > 0 {
|
||||
if let (chIdx, _) = book.chapterAndLocalOffset(for: storedBook.lastPosition) {
|
||||
selectedChapterIndex = chIdx
|
||||
}
|
||||
}
|
||||
if let modelURL = Bundle.main.url(forResource: "kokoro-v1_0", withExtension: "safetensors"),
|
||||
let voicesURL = Bundle.main.url(forResource: "voices", withExtension: "npz") {
|
||||
let voice = VoicePack.curated.first!
|
||||
self.synthesizer = try Synthesizer(voice: voice, modelURL: modelURL, voicesURL: voicesURL)
|
||||
} else {
|
||||
error = "TTS model files not found in app bundle."
|
||||
}
|
||||
} catch {
|
||||
self.error = "Failed to load book: \(error)"
|
||||
}
|
||||
}
|
||||
|
||||
private func startPlayback(from offset: CharacterOffset, book: Book) async throws {
|
||||
guard let synthesizer else { return }
|
||||
try await engine.play(book: book, from: offset, using: synthesizer)
|
||||
}
|
||||
|
||||
private func globalOffset(forLocalOffset local: Int, in book: Book) -> CharacterOffset {
|
||||
var offset = 0
|
||||
for chapter in book.chapters where chapter.index < selectedChapterIndex {
|
||||
offset += chapter.text.count
|
||||
}
|
||||
return offset + local
|
||||
}
|
||||
|
||||
private func currentSentenceRange(in book: Book) -> Range<Int>? {
|
||||
guard engine.state == .playing || engine.state == .synthesizing else { return nil }
|
||||
let sentences = book.sentences
|
||||
guard let idx = book.sentenceIndex(containing: engine.currentPosition) else { return nil }
|
||||
let sentence = sentences[idx]
|
||||
var chapterStart = 0
|
||||
for chapter in book.chapters where chapter.index < selectedChapterIndex {
|
||||
chapterStart += chapter.text.count
|
||||
}
|
||||
let localStart = sentence.range.lowerBound - chapterStart
|
||||
let localEnd = sentence.range.upperBound - chapterStart
|
||||
guard localStart >= 0 else { return nil }
|
||||
return localStart..<localEnd
|
||||
}
|
||||
}
|
||||
66
Vorleser-macOS/MacReadingTextView.swift
Normal file
66
Vorleser-macOS/MacReadingTextView.swift
Normal file
@@ -0,0 +1,66 @@
|
||||
import SwiftUI
|
||||
import AppKit
|
||||
import VorleserKit
|
||||
|
||||
struct MacReadingTextView: NSViewRepresentable {
|
||||
let text: String
|
||||
let highlightedRange: Range<Int>?
|
||||
let onClickCharacter: (CharacterOffset) -> Void
|
||||
|
||||
func makeNSView(context: Context) -> NSScrollView {
|
||||
let scrollView = NSTextView.scrollableTextView()
|
||||
let textView = scrollView.documentView as! NSTextView
|
||||
textView.isEditable = false
|
||||
textView.isSelectable = false
|
||||
textView.font = .preferredFont(forTextStyle: .body)
|
||||
textView.textContainerInset = NSSize(width: 16, height: 16)
|
||||
|
||||
let click = NSClickGestureRecognizer(target: context.coordinator, action: #selector(Coordinator.handleClick(_:)))
|
||||
textView.addGestureRecognizer(click)
|
||||
context.coordinator.textView = textView
|
||||
|
||||
return scrollView
|
||||
}
|
||||
|
||||
func updateNSView(_ scrollView: NSScrollView, context: Context) {
|
||||
let textView = scrollView.documentView as! NSTextView
|
||||
let attributed = NSMutableAttributedString(
|
||||
string: text,
|
||||
attributes: [
|
||||
.font: NSFont.preferredFont(forTextStyle: .body),
|
||||
.foregroundColor: NSColor.textColor,
|
||||
]
|
||||
)
|
||||
|
||||
if let range = highlightedRange,
|
||||
range.lowerBound >= 0,
|
||||
range.upperBound <= text.count {
|
||||
let nsRange = NSRange(location: range.lowerBound, length: range.upperBound - range.lowerBound)
|
||||
attributed.addAttribute(.backgroundColor, value: NSColor.systemYellow.withAlphaComponent(0.3), range: nsRange)
|
||||
}
|
||||
|
||||
textView.textStorage?.setAttributedString(attributed)
|
||||
}
|
||||
|
||||
func makeCoordinator() -> Coordinator {
|
||||
Coordinator(onClickCharacter: onClickCharacter)
|
||||
}
|
||||
|
||||
class Coordinator: NSObject {
|
||||
weak var textView: NSTextView?
|
||||
let onClickCharacter: (CharacterOffset) -> Void
|
||||
|
||||
init(onClickCharacter: @escaping (CharacterOffset) -> Void) {
|
||||
self.onClickCharacter = onClickCharacter
|
||||
}
|
||||
|
||||
@objc func handleClick(_ gesture: NSClickGestureRecognizer) {
|
||||
guard let textView else { return }
|
||||
let point = gesture.location(in: textView)
|
||||
let characterIndex = textView.characterIndexForInsertion(at: point)
|
||||
if characterIndex < textView.string.count {
|
||||
onClickCharacter(characterIndex)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
13
Vorleser-macOS/VorleserMacApp.swift
Normal file
13
Vorleser-macOS/VorleserMacApp.swift
Normal file
@@ -0,0 +1,13 @@
|
||||
import SwiftUI
|
||||
import SwiftData
|
||||
import Storage
|
||||
|
||||
@main
|
||||
struct VorleserMacApp: App {
|
||||
var body: some Scene {
|
||||
WindowGroup {
|
||||
MacLibraryView()
|
||||
}
|
||||
.modelContainer(for: StoredBook.self)
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user