clusterfuck
/
crabidy
4
1
Fork 0
Code Issues 15 Pull Requests Actions Packages Projects 1 Releases 5 Wiki Activity

Fix incorrect offset when turning off shuffle
CI checks / stable / fmt (push) Successful in 4s Details

This commit is contained in:
Hans Mündelein 2023-06-14 11:15:42 +02:00
parent f8a77ee6ed
commit 6db11131c0
Signed by: hans
GPG Key ID: BA7B55E984CE74F4
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crabidy-server/src/lib.rs
View File

@ -58,7 +58,13 @@ impl QueueManager {
pub fn shuffle_off(&mut self) { pub fn shuffle_off(&mut self) {
self.shuffle = false; self.shuffle = false;
let pos = self.current_position();
self.current_offset = pos;
self.play_order = (0..self.tracks.len()).collect(); self.play_order = (0..self.tracks.len()).collect();
debug!(
"offset: {}, order: {:?}",
self.current_offset, self.play_order
);
} }
pub fn shuffle_all(&mut self) { pub fn shuffle_all(&mut self) {

4
crabidy-server/src/playback.rs
View File

@ -513,6 +513,7 @@ impl Playback {
#[instrument(skip(self))] #[instrument(skip(self))]
async fn flatten_node(&self, uuid: &str) -> Vec<Track> { async fn flatten_node(&self, uuid: &str) -> Vec<Track> {
debug!("flattening node");
let tx = self.provider_tx.clone(); let tx = self.provider_tx.clone();
let (result_tx, result_rx) = flume::bounded(1); let (result_tx, result_rx) = flume::bounded(1);
let span = debug_span!("prov-chan"); let span = debug_span!("prov-chan");
@ -555,6 +556,7 @@ impl Playback {
#[instrument(skip(self))] #[instrument(skip(self))]
async fn get_urls_for_track(&self, uuid: &str) -> Result<Vec<String>, ProviderError> { async fn get_urls_for_track(&self, uuid: &str) -> Result<Vec<String>, ProviderError> {
debug!("getting urls for track");
let tx = self.provider_tx.clone(); let tx = self.provider_tx.clone();
let (result_tx, result_rx) = flume::bounded(1); let (result_tx, result_rx) = flume::bounded(1);
let span = tracing::trace_span!("prov-chan"); let span = tracing::trace_span!("prov-chan");
@ -575,6 +577,7 @@ impl Playback {
#[instrument(skip(self))] #[instrument(skip(self))]
async fn play_or_stop(&self, track: Option<Track>) { async fn play_or_stop(&self, track: Option<Track>) {
debug!("play or stop");
if let Some(track) = track { if let Some(track) = track {
let mut uuid = track.uuid.clone(); let mut uuid = track.uuid.clone();
let urls = loop { let urls = loop {
@ -621,6 +624,7 @@ impl Playback {
#[instrument(skip(self))] #[instrument(skip(self))]
async fn play(&self, track: Option<Track>) { async fn play(&self, track: Option<Track>) {
debug!("play");
if let Some(track) = track { if let Some(track) = track {
let mut uuid = track.uuid.clone(); let mut uuid = track.uuid.clone();
let urls = loop { let urls = loop {

1
crabidy-server/src/provider.rs
View File

@ -132,6 +132,7 @@ impl ProviderClient for ProviderOrchestrator {
} }
#[instrument(skip(self))] #[instrument(skip(self))]
async fn get_urls_for_track(&self, track_uuid: &str) -> Result<Vec<String>, ProviderError> { async fn get_urls_for_track(&self, track_uuid: &str) -> Result<Vec<String>, ProviderError> {
debug!("get_urls_for_track");
self.tidal_client self.tidal_client
.get_urls_for_track(track_uuid) .get_urls_for_track(track_uuid)
.in_current_span() .in_current_span()