removed unwanted bar now with waveforms, major updates and enhancements
This commit is contained in:
+14
-12
@@ -437,24 +437,26 @@ import CoreAudio
|
||||
let token = UUID();waveformGeneration = token;waveformLoading = true;waveformUnavailable = false
|
||||
let directory = waveformCacheDirectory
|
||||
waveformTask = Task.detached(priority:.utility) { [weak self] in
|
||||
let result: Result<AudioWaveform.Analysis,Error>
|
||||
var cached = false,saved = false
|
||||
let result: Result<(AudioWaveform.Analysis,Bool,Bool),Error>
|
||||
do {
|
||||
if !force,let analysis = try? WaveformCache.load(audio:url,directory:directory) {
|
||||
result = .success(analysis);cached = true;saved = true
|
||||
} else {
|
||||
let analysis = try AudioWaveform.analyse(url:url,cancelled:{ Task.isCancelled })
|
||||
if !Task.isCancelled { saved = (try? WaveformCache.save(analysis,audio:url,directory:directory)) != nil }
|
||||
result = .success(analysis)
|
||||
}
|
||||
result = .success(try await WaveformWorker.run { cancelled in
|
||||
if !force,let analysis = try? WaveformCache.load(audio:url,directory:directory) {
|
||||
return (analysis,true,true)
|
||||
}
|
||||
let analysis = try AudioWaveform.analyse(url:url,cancelled:cancelled)
|
||||
if cancelled() { throw CancellationError() }
|
||||
let saved = (try? WaveformCache.save(analysis,audio:url,directory:directory)) != nil
|
||||
return (analysis,false,saved)
|
||||
})
|
||||
} catch { result = .failure(error) }
|
||||
guard !Task.isCancelled else { return }
|
||||
let loadedFromCache = cached,analysisSaved = saved
|
||||
await MainActor.run { [weak self] in
|
||||
guard let self,self.waveformGeneration == token else { return }
|
||||
self.waveformLoading = false;self.waveformFromCache = loadedFromCache;self.waveformSaved = analysisSaved
|
||||
self.waveformLoading = false
|
||||
switch result {
|
||||
case .success(let analysis):self.waveform = analysis.levels;self.waveformBands = analysis.bands
|
||||
case .success(let (analysis,cached,saved)):
|
||||
self.waveformFromCache = cached;self.waveformSaved = saved
|
||||
self.waveform = analysis.levels;self.waveformBands = analysis.bands
|
||||
case .failure:self.waveformUnavailable = true
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user