Lomanic/oggify
1
0
Fork 0
mirror of https://github.com/pisto/oggify synced 2024-11-22 03:17:30 +00:00
Code Issues Releases Wiki Activity

Also give album name and spotify id to the helper script

Browse Source
This commit is contained in:
Lorenzo Pistone 2019-02-14 16:45:42 +01:00
parent ffd5b407e9
commit 348f885920
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.rs
View File

@ -21,7 +21,7 @@ use librespot_core::authentication::Credentials;
use librespot_core::config::SessionConfig; use librespot_core::config::SessionConfig;
use librespot_core::session::Session; use librespot_core::session::Session;
use librespot_core::spotify_id::SpotifyId; use librespot_core::spotify_id::SpotifyId;
use librespot_metadata::{Artist, FileFormat, Metadata, Track}; use librespot_metadata::{Artist, FileFormat, Metadata, Track, Album};
use regex::Regex; use regex::Regex;
use scoped_threadpool::Pool; use scoped_threadpool::Pool;
use tokio_core::reactor::Core; use tokio_core::reactor::Core;
@ -96,9 +96,10 @@ fn main() {
std::fs::write(&fname, &decrypted_buffer[0xa7..]).expect("Cannot write decrypted track"); std::fs::write(&fname, &decrypted_buffer[0xa7..]).expect("Cannot write decrypted track");
info!("Filename: {}", fname); info!("Filename: {}", fname);
} else { } else {
let album = core.run(Album::get(&session, track.album)).expect("Cannot get album metadata");
let mut cmd = Command::new(args[3].to_owned()); let mut cmd = Command::new(args[3].to_owned());
cmd.stdin(Stdio::piped()); cmd.stdin(Stdio::piped());
cmd.arg(track.name).args(artists_strs.iter()); cmd.arg(id.to_base62()).arg(track.name).arg(album.name).args(artists_strs.iter());
let mut child = cmd.spawn().expect("Could not run helper program"); let mut child = cmd.spawn().expect("Could not run helper program");
let pipe = child.stdin.as_mut().expect("Could not open helper stdin"); let pipe = child.stdin.as_mut().expect("Could not open helper stdin");
pipe.write_all(&decrypted_buffer[0xa7..]).expect("Failed to write to stdin"); pipe.write_all(&decrypted_buffer[0xa7..]).expect("Failed to write to stdin");

13
tag_ogg
View File

@ -2,12 +2,17 @@
set -e set -e
fname=$(echo "${2} - ${1}.ogg" | tr '/' - | tr '\0' ' ') fname=$(echo "${4} - ${2}.ogg" | tr '/' - | tr '\0' ' ')
cat > "$fname" cat > "$fname"
{ {
echo "TITLE=${1}" | tr '\n' ' ' echo "SPOTIFY_ID=${1}"
shift title=$(tr '\n' ' ' <<< "${2}")
album=$(tr '\n' ' ' <<< "${3}")
echo "TITLE=${title}"
echo "ALBUM=${album}"
shift 3
for artist in "$@"; do for artist in "$@"; do
echo "ARTIST=${artist}" | tr '\n' ' ' artist=$(tr '\n' ' ' <<< "${artist}")
echo "ARTIST=${artist}"
done done
} | vorbiscomment -a "$fname" } | vorbiscomment -a "$fname"