Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ tui-equalizer = "0.2.0-alpha"
tui-bar-graph = "0.3.3"
colorgrad = "0.8.0"
tokio = { version = "1.52", features = ["full"] }
rand = "0.8.4"
rand = "0.10.2"
anyhow = "1.0.102"
chrono = "0.4.45"
log = "0.4.32"
Expand Down
3 changes: 1 addition & 2 deletions src/cli/cli_app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use crate::infra::network::{IoEvent, Network};
use super::util::{Flag, Format, FormatType, JumpDirection, Type};

use anyhow::{anyhow, Result};
use rand::{thread_rng, Rng};
use rspotify::model::{
context::CurrentPlaybackContext, idtypes::Id, playlist::FullPlaylist, PlayableItem,
};
Expand Down Expand Up @@ -486,7 +485,7 @@ impl CliApp {
{
Ok(p) => {
let num = p.items.total;
Some(thread_rng().gen_range(0..num) as usize)
Some(rand::random_range(0..num) as usize)
}
Err(e) => {
self
Expand Down
2 changes: 1 addition & 1 deletion src/infra/network/user.rs
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ impl UserNetwork for Network {

// 3. Shuffle
{
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
all_tracks.shuffle(&mut rng);
}

Expand Down
4 changes: 2 additions & 2 deletions src/infra/player/streaming.rs
Original file line number Diff line number Diff line change
Expand Up @@ -808,9 +808,9 @@ fn get_or_create_device_id(cache_path: Option<&std::path::Path>) -> Option<Strin

/// Hyphenated UUID-v4-shaped string, matching librespot's default device id format.
fn new_device_id_string() -> String {
use rand::RngCore;
use rand::Rng;
let mut b = [0u8; 16];
rand::thread_rng().fill_bytes(&mut b);
rand::rng().fill_bytes(&mut b);
b[6] = (b[6] & 0x0f) | 0x40;
b[8] = (b[8] & 0x3f) | 0x80;
format!(
Expand Down
2 changes: 1 addition & 1 deletion src/infra/radio/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ impl RadioSource {
/// GET `path` from the first responding mirror, in shuffled order.
async fn get_from_any_mirror(&self, path: &str) -> Result<String> {
let mut mirrors = MIRRORS;
mirrors.shuffle(&mut rand::thread_rng());
mirrors.shuffle(&mut rand::rng());

let mut last_err = anyhow!("no radio-browser mirrors configured");
for base in mirrors {
Expand Down
6 changes: 3 additions & 3 deletions src/infra/subsonic/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ use std::time::Duration;
use anyhow::{anyhow, Context, Result};
use futures::StreamExt;
use md5::{Digest, Md5};
use rand::Rng;
use rand::RngExt;
use reqwest::Client;

use crate::core::plugin_api::{
Expand Down Expand Up @@ -218,10 +218,10 @@ impl SubsonicSource {
/// Generate a random 12-character alphanumeric salt.
fn generate_salt(&self) -> String {
const CHARSET: &[u8] = b"abcdefghijklmnopqrstuvwxyz0123456789";
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
(0..12)
.map(|_| {
let idx = rng.gen_range(0..CHARSET.len());
let idx = rng.random_range(0..CHARSET.len());
CHARSET[idx] as char
})
.collect()
Expand Down
6 changes: 3 additions & 3 deletions src/infra/youtube/playlists.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
use std::path::{Path, PathBuf};

use anyhow::{anyhow, bail, Context, Result};
use rand::Rng;
use rand::RngExt;
use serde::{Deserialize, Serialize};

use crate::core::plugin_api::{PlaylistInfo, TrackInfo};
Expand Down Expand Up @@ -148,10 +148,10 @@ pub fn save(path: &Path, file: &PlaylistsFile) -> Result<()> {
/// `file`.
fn generate_id(file: &PlaylistsFile) -> String {
const CHARSET: &[u8] = b"abcdefghijklmnopqrstuvwxyz0123456789";
let mut rng = rand::thread_rng();
let mut rng = rand::rng();
loop {
let id: String = (0..12)
.map(|_| CHARSET[rng.gen_range(0..CHARSET.len())] as char)
.map(|_| CHARSET[rng.random_range(0..CHARSET.len())] as char)
.collect();
if !file.playlists.iter().any(|p| p.id == id) {
return id;
Expand Down
11 changes: 5 additions & 6 deletions src/tui/handlers/track_table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ use crate::core::app::{
};
use crate::infra::network::IoEvent;
use crate::tui::event::Key;
use rand::{thread_rng, Rng};
use rspotify::prelude::Id;

pub fn handler(key: Key, app: &mut App) {
Expand Down Expand Up @@ -257,7 +256,7 @@ fn play_random_song(app: &mut App) {
app.dispatch(IoEvent::StartPlayback(
context_id,
None,
Some(thread_rng().gen_range(0..val as usize)),
Some(rand::random_range(0..val as usize)),
));
}
}
Expand All @@ -270,7 +269,7 @@ fn play_random_song(app: &mut App) {
.filter_map(|track| track.uri.clone())
.collect();
if !playable_ids.is_empty() {
let rand_idx = thread_rng().gen_range(0..playable_ids.len());
let rand_idx = rand::random_range(0..playable_ids.len());
app.dispatch(IoEvent::StartPlayback(
None,
Some(playable_ids),
Expand All @@ -289,7 +288,7 @@ fn play_random_song(app: &mut App) {
}
}
if !playable_ids.is_empty() {
let rand_idx = thread_rng().gen_range(0..playable_ids.len());
let rand_idx = rand::random_range(0..playable_ids.len());
app.dispatch(IoEvent::StartPlayback(
None,
Some(playable_ids),
Expand All @@ -306,7 +305,7 @@ fn play_random_song(app: &mut App) {
.filter_map(|track| track.uri.clone())
.collect();
if !playable_ids.is_empty() {
let rand_idx = thread_rng().gen_range(0..playable_ids.len());
let rand_idx = rand::random_range(0..playable_ids.len());
app.dispatch(IoEvent::StartPlayback(
Some(playable_ids[rand_idx].clone()),
None,
Expand All @@ -324,7 +323,7 @@ fn play_random_song(app: &mut App) {
.filter_map(|track| track.uri.clone())
.collect();
if !playable_ids.is_empty() {
let rand_idx = thread_rng().gen_range(0..playable_ids.len());
let rand_idx = rand::random_range(0..playable_ids.len());
app.dispatch(IoEvent::StartPlayback(
None,
Some(playable_ids),
Expand Down
Loading