Merge pull request #173 from librespot-org/base62

Add to_base62 method

core/Cargo.toml

@@ -12,6 +12,7 @@ base64 = "0.5.0"
 byteorder = "1.0"
 bytes = "0.4"
 error-chain = { version = "0.9.0", default_features = false }
+extprim = "1.5.1" 
 futures = "0.1.8"
 hyper = "0.11.2"
 lazy_static = "0.2.0"

core/src/lib.rs

@@ -15,6 +15,7 @@ extern crate base64;
 extern crate byteorder;
 extern crate bytes;
 extern crate crypto;
+extern crate extprim;
 extern crate hyper;
 extern crate num_bigint;
 extern crate num_integer;

core/src/spotify_id.rs

@@ -1,7 +1,7 @@
 use byteorder::{BigEndian, ByteOrder};
+use extprim::u128::u128;
 use std;
 use std::fmt;
-use util::u128;
 // Unneeded since 1.21
 #[allow(unused_imports)]
 use std::ascii::AsciiExt;
@@ -23,10 +23,10 @@ impl SpotifyId {
         for c in data {
             let d = match BASE16_DIGITS.iter().position(|e| e == c) {
                 None => return Err(SpotifyIdError),
-                Some(x) => x as u8,
+                Some(x) => x as u64,
             };
-            n = n * u128::from(16);
-            n = n + u128::from(d);
+            n = n * u128::new(16);
+            n = n + u128::new(d);
         }
 
         Ok(SpotifyId(n))
@@ -39,10 +39,10 @@ impl SpotifyId {
         for c in data {
             let d = match BASE62_DIGITS.iter().position(|e| e == c) {
                 None => return Err(SpotifyIdError),
-                Some(x) => x as u8,
+                Some(x) => x as u64,
             };
-            n = n * u128::from(62);
-            n = n + u128::from(d);
+            n = n * u128::new(62);
+            n = n + u128::new(d);
         }
 
         Ok(SpotifyId(n))
@@ -61,27 +61,35 @@ impl SpotifyId {
 
     pub fn to_base16(&self) -> String {
         let &SpotifyId(ref n) = self;
-        let (high, low) = n.parts();
 
         let mut data = [0u8; 32];
-        for i in 0..16 {
-            data[31 - i] = BASE16_DIGITS[(low.wrapping_shr(4 * i as u32) & 0xF) as usize];
+        for i in 0..32 {
+            data[31 - i] = BASE16_DIGITS[(n.wrapping_shr(4 * i as u32).low64() & 0xF) as usize];
         }
-        for i in 0..16 {
-            data[15 - i] = BASE16_DIGITS[(high.wrapping_shr(4 * i as u32) & 0xF) as usize];
+
+        std::str::from_utf8(&data).unwrap().to_owned()
+    }
+
+    pub fn to_base62(&self) -> String {
+        let &SpotifyId(mut n) = self;
+
+        let mut data = [0u8; 22];
+        let sixty_two = u128::new(62);
+        for i in 0..22 {
+            data[21 - i] = BASE62_DIGITS[(n % sixty_two).low64() as usize];
+            n /= sixty_two;
         }
 
         std::str::from_utf8(&data).unwrap().to_owned()
     }
 
     pub fn to_raw(&self) -> [u8; 16] {
         let &SpotifyId(ref n) = self;
-        let (high, low) = n.parts();
 
         let mut data = [0u8; 16];
 
-        BigEndian::write_u64(&mut data[0..8], high);
-        BigEndian::write_u64(&mut data[8..16], low);
+        BigEndian::write_u64(&mut data[0..8], n.high64());
+        BigEndian::write_u64(&mut data[8..16], n.low64());
 
         data
     }

core/src/util/mod.rs

@@ -5,10 +5,6 @@ use rand::{Rand, Rng};
 use std::mem;
 use std::ops::{Mul, Rem, Shr};
 
-mod int128;
-
-pub(crate) use util::int128::u128;
-
 pub fn rand_vec<G: Rng, R: Rand>(rng: &mut G, size: usize) -> Vec<R> {
     rng.gen_iter().take(size).collect()
 }

playback/src/player.rs

@@ -533,7 +533,11 @@ impl PlayerInternal {
     fn load_track(&self, track_id: SpotifyId, position: i64) -> Option<(Decoder, f32)> {
         let track = Track::get(&self.session, track_id).wait().unwrap();
 
-        info!("Loading track \"{}\"", track.name);
+        info!(
+            "Loading track \"{}\" with Spotify URI \"spotify:track:{}\"",
+            track.name,
+            track_id.to_base62()
+        );
 
         let track = match self.find_available_alternative(&track) {
             Some(track) => track,