hax/grufkork-DownOnSpot
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rename configuration back to settings

Browse source
This commit is contained in:
oSumAtrIX 2021-10-17 09:12:39 +02:00
parent 79d3d1bc5e
commit 873c71c9b8
No known key found for this signature in database
GPG key ID: A9B3094ACDB604B4
2 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -1347,7 +1347,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot" name = "librespot"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"base64", "base64",
"env_logger", "env_logger",
@ -1373,7 +1373,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-audio" name = "librespot-audio"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"aes-ctr", "aes-ctr",
"byteorder", "byteorder",
@ -1388,7 +1388,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-connect" name = "librespot-connect"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"form_urlencoded", "form_urlencoded",
"futures-util", "futures-util",
@ -1408,7 +1408,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-core" name = "librespot-core"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"aes", "aes",
"base64", "base64",
@ -1448,7 +1448,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-discovery" name = "librespot-discovery"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"aes-ctr", "aes-ctr",
"base64", "base64",
@ -1470,7 +1470,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-metadata" name = "librespot-metadata"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"async-trait", "async-trait",
"byteorder", "byteorder",
@ -1483,7 +1483,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-playback" name = "librespot-playback"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"byteorder", "byteorder",
"cpal", "cpal",
@ -1507,7 +1507,7 @@ dependencies = [
[[package]] [[package]]
name = "librespot-protocol" name = "librespot-protocol"
version = "0.3.0" version = "0.3.0"
source = "git+https://github.com/oSumAtrIX/free-librespot#19dea7516f71818a64cbded6c5a94065f22677c7" source = "git+ssh://git@github.com/oSumAtrIX/free-librespot.git?branch=dev#19dea7516f71818a64cbded6c5a94065f22677c7"
dependencies = [ dependencies = [
"glob", "glob",
"protobuf", "protobuf",

10
src/main.rs
View file

@ -4,7 +4,7 @@ extern crate log;
use async_std::{task, task::block_on}; use async_std::{task, task::block_on};
use colored::{Colorize, control::set_virtual_terminal}; use colored::{Colorize, control::set_virtual_terminal};
use downloader::{DownloadState, Downloader}; use downloader::{DownloadState, Downloader};
use configuration::Configuration; use settings::Settings;
use spotify::Spotify; use spotify::Spotify;
use std::{ use std::{
env, env,
@ -16,7 +16,7 @@ use std::{
mod converter; mod converter;
mod downloader; mod downloader;
mod error; mod error;
mod configuration; mod settings;
mod spotify; mod spotify;
mod tag; mod tag;
@ -33,7 +33,7 @@ async fn start() {
}; };
} }
let settings = match Configuration::load("settings.json".to_string()).await { let settings = match Settings::load().await {
Ok(settings) => { Ok(settings) => {
println!( println!(
"{} {}.", "{} {}.",
@ -49,8 +49,8 @@ async fn start() {
e e
); );
let default_settings = let default_settings =
Configuration::new("username", "password", "client_id", "secret").unwrap(); Settings::new("username", "password", "client_id", "secret").unwrap();
match default_settings.save("settings.json".to_string()).await { match default_settings.save().await {
Ok(_) => { Ok(_) => {
println!( println!(
"{}", "{}",