mirror of
https://github.com/cooperhammond/irs.git
synced 2025-07-02 15:08:14 +00:00
crystal tool format respec
This commit is contained in:
parent
d1657ba86d
commit
de219cbe66
|
@ -8,9 +8,7 @@ require "../glue/song"
|
||||||
require "../glue/album"
|
require "../glue/album"
|
||||||
require "../glue/playlist"
|
require "../glue/playlist"
|
||||||
|
|
||||||
|
|
||||||
class CLI
|
class CLI
|
||||||
|
|
||||||
# layout:
|
# layout:
|
||||||
# [[shortflag, longflag], key, type]
|
# [[shortflag, longflag], key, type]
|
||||||
@options = [
|
@options = [
|
||||||
|
@ -21,10 +19,9 @@ class CLI
|
||||||
[["-a", "--artist"], "artist", "string"],
|
[["-a", "--artist"], "artist", "string"],
|
||||||
[["-s", "--song"], "song", "string"],
|
[["-s", "--song"], "song", "string"],
|
||||||
[["-A", "--album"], "album", "string"],
|
[["-A", "--album"], "album", "string"],
|
||||||
[["-p", "--playlist"], "playlist", "string"]
|
[["-p", "--playlist"], "playlist", "string"],
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
@args : Hash(String, String)
|
@args : Hash(String, String)
|
||||||
|
|
||||||
def initialize(argv : Array(String))
|
def initialize(argv : Array(String))
|
||||||
|
@ -68,8 +65,7 @@ class CLI
|
||||||
end
|
end
|
||||||
|
|
||||||
def act_on_args
|
def act_on_args
|
||||||
|
Config.check_necessities
|
||||||
Config.check_necessities()
|
|
||||||
|
|
||||||
if @args["help"]? || @args.keys.size == 0
|
if @args["help"]? || @args.keys.size == 0
|
||||||
help
|
help
|
||||||
|
@ -86,17 +82,17 @@ class CLI
|
||||||
elsif @args["song"]? && @args["artist"]?
|
elsif @args["song"]? && @args["artist"]?
|
||||||
s = Song.new(@args["song"], @args["artist"])
|
s = Song.new(@args["song"], @args["artist"])
|
||||||
s.provide_client_keys(Config.client_key, Config.client_secret)
|
s.provide_client_keys(Config.client_key, Config.client_secret)
|
||||||
s.grab_it()
|
s.grab_it
|
||||||
s.organize_it(Config.music_directory)
|
s.organize_it(Config.music_directory)
|
||||||
exit
|
exit
|
||||||
elsif @args["album"]? && @args["artist"]?
|
elsif @args["album"]? && @args["artist"]?
|
||||||
a = Album.new(@args["album"], @args["artist"])
|
a = Album.new(@args["album"], @args["artist"])
|
||||||
a.provide_client_keys(Config.client_key, Config.client_secret)
|
a.provide_client_keys(Config.client_key, Config.client_secret)
|
||||||
a.grab_it()
|
a.grab_it
|
||||||
elsif @args["playlist"]? && @args["artist"]?
|
elsif @args["playlist"]? && @args["artist"]?
|
||||||
p = Playlist.new(@args["playlist"], @args["artist"])
|
p = Playlist.new(@args["playlist"], @args["artist"])
|
||||||
p.provide_client_keys(Config.client_key, Config.client_secret)
|
p.provide_client_keys(Config.client_key, Config.client_secret)
|
||||||
p.grab_it()
|
p.grab_it
|
||||||
else
|
else
|
||||||
puts Style.red("Those arguments don't do anything when used that way.")
|
puts Style.red("Those arguments don't do anything when used that way.")
|
||||||
puts "Type `irs -h` to see usage."
|
puts "Type `irs -h` to see usage."
|
||||||
|
@ -111,7 +107,6 @@ class CLI
|
||||||
current_key = ""
|
current_key = ""
|
||||||
pass_next_arg = false
|
pass_next_arg = false
|
||||||
argv.each do |arg|
|
argv.each do |arg|
|
||||||
|
|
||||||
# If the previous arg was an arg flag, this is an arg, so pass it
|
# If the previous arg was an arg flag, this is an arg, so pass it
|
||||||
if pass_next_arg
|
if pass_next_arg
|
||||||
pass_next_arg = false
|
pass_next_arg = false
|
||||||
|
@ -140,7 +135,6 @@ class CLI
|
||||||
arg_error argv, i, %("#{arg}" needs an argument.)
|
arg_error argv, i, %("#{arg}" needs an argument.)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
key = flag[1].as(String)
|
key = flag[1].as(String)
|
||||||
if flag[2] == "string"
|
if flag[2] == "string"
|
||||||
arguments[key] = argv[i + 1]
|
arguments[key] = argv[i + 1]
|
||||||
|
|
|
@ -2,7 +2,6 @@ require "yaml"
|
||||||
|
|
||||||
require "./styles"
|
require "./styles"
|
||||||
|
|
||||||
|
|
||||||
EXAMPLE_CONFIG = <<-EOP
|
EXAMPLE_CONFIG = <<-EOP
|
||||||
#{Style.dim "exampleconfig.yml"}
|
#{Style.dim "exampleconfig.yml"}
|
||||||
#{Style.dim "===="}
|
#{Style.dim "===="}
|
||||||
|
@ -18,7 +17,6 @@ single_folder_playlist:
|
||||||
EOP
|
EOP
|
||||||
|
|
||||||
module Config
|
module Config
|
||||||
|
|
||||||
extend self
|
extend self
|
||||||
|
|
||||||
@@arguments = [
|
@@arguments = [
|
||||||
|
@ -28,7 +26,7 @@ module Config
|
||||||
"client_secret",
|
"client_secret",
|
||||||
"single_folder_playlist: enabled",
|
"single_folder_playlist: enabled",
|
||||||
"single_folder_playlist: retain_playlist_order",
|
"single_folder_playlist: retain_playlist_order",
|
||||||
"single_folder_playlist: overwrite_album"
|
"single_folder_playlist: overwrite_album",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@conf = YAML.parse("")
|
@@conf = YAML.parse("")
|
||||||
|
|
|
@ -4,9 +4,7 @@ require "./mapper"
|
||||||
require "./song"
|
require "./song"
|
||||||
require "./list"
|
require "./list"
|
||||||
|
|
||||||
|
|
||||||
class Album < SpotifyList
|
class Album < SpotifyList
|
||||||
|
|
||||||
@home_music_directory = Config.music_directory
|
@home_music_directory = Config.music_directory
|
||||||
|
|
||||||
# Uses the `spotify_searcher` defined in parent `SpotifyList` to find the
|
# Uses the `spotify_searcher` defined in parent `SpotifyList` to find the
|
||||||
|
@ -14,7 +12,7 @@ class Album < SpotifyList
|
||||||
def find_it
|
def find_it
|
||||||
album = @spotify_searcher.find_item("album", {
|
album = @spotify_searcher.find_item("album", {
|
||||||
"name" => @list_name.as(String),
|
"name" => @list_name.as(String),
|
||||||
"artist" => @list_author.as(String)
|
"artist" => @list_author.as(String),
|
||||||
})
|
})
|
||||||
if album
|
if album
|
||||||
return album.as(JSON::Any)
|
return album.as(JSON::Any)
|
||||||
|
|
|
@ -8,10 +8,9 @@ require "../interact/tagger"
|
||||||
|
|
||||||
require "./song"
|
require "./song"
|
||||||
|
|
||||||
|
|
||||||
# A parent class for downloading albums and playlists from spotify
|
# A parent class for downloading albums and playlists from spotify
|
||||||
abstract class SpotifyList
|
abstract class SpotifyList
|
||||||
@spotify_searcher = SpotifySearcher.new()
|
@spotify_searcher = SpotifySearcher.new
|
||||||
@file_names = [] of String
|
@file_names = [] of String
|
||||||
|
|
||||||
def initialize(@list_name : String, @list_author : String?)
|
def initialize(@list_name : String, @list_author : String?)
|
||||||
|
@ -19,7 +18,6 @@ abstract class SpotifyList
|
||||||
|
|
||||||
# Finds the list, and downloads all of the songs using the `Song` class
|
# Finds the list, and downloads all of the songs using the `Song` class
|
||||||
def grab_it
|
def grab_it
|
||||||
|
|
||||||
if !@spotify_searcher.authorized?
|
if !@spotify_searcher.authorized?
|
||||||
raise("Need to call provide_client_keys on Album or Playlist class.")
|
raise("Need to call provide_client_keys on Album or Playlist class.")
|
||||||
end
|
end
|
||||||
|
@ -38,7 +36,7 @@ abstract class SpotifyList
|
||||||
song = Song.new(data["name"].to_s, data["artists"][0]["name"].to_s)
|
song = Song.new(data["name"].to_s, data["artists"][0]["name"].to_s)
|
||||||
song.provide_spotify(@spotify_searcher)
|
song.provide_spotify(@spotify_searcher)
|
||||||
song.provide_metadata(data)
|
song.provide_metadata(data)
|
||||||
song.grab_it()
|
song.grab_it
|
||||||
|
|
||||||
organize(song)
|
organize(song)
|
||||||
|
|
||||||
|
@ -64,5 +62,4 @@ abstract class SpotifyList
|
||||||
# Needed because most people want albums sorted by artist, but playlists all
|
# Needed because most people want albums sorted by artist, but playlists all
|
||||||
# in one folder
|
# in one folder
|
||||||
private abstract def organize(song : Song)
|
private abstract def organize(song : Song)
|
||||||
|
|
||||||
end
|
end
|
|
@ -4,7 +4,7 @@ class PlaylistExtensionMapper
|
||||||
JSON.mapping(
|
JSON.mapping(
|
||||||
tracks: {
|
tracks: {
|
||||||
type: PlaylistTracksMapper,
|
type: PlaylistTracksMapper,
|
||||||
setter: true
|
setter: true,
|
||||||
},
|
},
|
||||||
id: String,
|
id: String,
|
||||||
images: JSON::Any,
|
images: JSON::Any,
|
||||||
|
@ -18,7 +18,7 @@ class PlaylistTracksMapper
|
||||||
JSON.mapping(
|
JSON.mapping(
|
||||||
items: {
|
items: {
|
||||||
type: Array(JSON::Any),
|
type: Array(JSON::Any),
|
||||||
setter: true
|
setter: true,
|
||||||
},
|
},
|
||||||
total: Int32
|
total: Int32
|
||||||
)
|
)
|
||||||
|
@ -29,7 +29,7 @@ class AlbumTracksMapper
|
||||||
album: {
|
album: {
|
||||||
type: JSON::Any,
|
type: JSON::Any,
|
||||||
nilable: true,
|
nilable: true,
|
||||||
setter: true
|
setter: true,
|
||||||
},
|
},
|
||||||
artists: JSON::Any,
|
artists: JSON::Any,
|
||||||
disc_number: Int32,
|
disc_number: Int32,
|
||||||
|
@ -41,7 +41,6 @@ class AlbumTracksMapper
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
def parse_to_json(string_json : String) : JSON::Any
|
def parse_to_json(string_json : String) : JSON::Any
|
||||||
return JSON.parse(string_json)
|
return JSON.parse(string_json)
|
||||||
end
|
end
|
|
@ -3,9 +3,7 @@ require "../bottle/config"
|
||||||
require "./song"
|
require "./song"
|
||||||
require "./list"
|
require "./list"
|
||||||
|
|
||||||
|
|
||||||
class Playlist < SpotifyList
|
class Playlist < SpotifyList
|
||||||
|
|
||||||
@home_music_directory = Config.music_directory
|
@home_music_directory = Config.music_directory
|
||||||
@playlist : JSON::Any?
|
@playlist : JSON::Any?
|
||||||
|
|
||||||
|
@ -14,7 +12,7 @@ class Playlist < SpotifyList
|
||||||
def find_it
|
def find_it
|
||||||
@playlist = @spotify_searcher.find_item("playlist", {
|
@playlist = @spotify_searcher.find_item("playlist", {
|
||||||
"name" => @list_name.as(String),
|
"name" => @list_name.as(String),
|
||||||
"username" => @list_author.as(String)
|
"username" => @list_author.as(String),
|
||||||
})
|
})
|
||||||
if @playlist
|
if @playlist
|
||||||
return @playlist.as(JSON::Any)
|
return @playlist.as(JSON::Any)
|
||||||
|
|
|
@ -4,9 +4,8 @@ require "../search/youtube"
|
||||||
require "../interact/ripper"
|
require "../interact/ripper"
|
||||||
require "../interact/tagger"
|
require "../interact/tagger"
|
||||||
|
|
||||||
|
|
||||||
class Song
|
class Song
|
||||||
@spotify_searcher = SpotifySearcher.new()
|
@spotify_searcher = SpotifySearcher.new
|
||||||
@client_id = ""
|
@client_id = ""
|
||||||
@client_secret = ""
|
@client_secret = ""
|
||||||
|
|
||||||
|
@ -21,7 +20,7 @@ class Song
|
||||||
# Find, downloads, and tags the mp3 song that this class represents.
|
# Find, downloads, and tags the mp3 song that this class represents.
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# Song.new("Bohemian Rhapsody", "Queen").grab_it()
|
# Song.new("Bohemian Rhapsody", "Queen").grab_it
|
||||||
# ```
|
# ```
|
||||||
def grab_it
|
def grab_it
|
||||||
if !@spotify_searcher.authorized? && !@metadata
|
if !@spotify_searcher.authorized? && !@metadata
|
||||||
|
@ -37,7 +36,7 @@ class Song
|
||||||
puts "Searching for metadata ..."
|
puts "Searching for metadata ..."
|
||||||
@metadata = @spotify_searcher.find_item("track", {
|
@metadata = @spotify_searcher.find_item("track", {
|
||||||
"name" => @song_name,
|
"name" => @song_name,
|
||||||
"artist" => @artist_name
|
"artist" => @artist_name,
|
||||||
})
|
})
|
||||||
|
|
||||||
if !@metadata
|
if !@metadata
|
||||||
|
@ -82,11 +81,10 @@ class Song
|
||||||
tagger.add_text_tag("disc", data["disc_number"].to_s)
|
tagger.add_text_tag("disc", data["disc_number"].to_s)
|
||||||
|
|
||||||
puts "Tagging metadata ..."
|
puts "Tagging metadata ..."
|
||||||
tagger.save()
|
tagger.save
|
||||||
File.delete(temp_albumart_filename)
|
File.delete(temp_albumart_filename)
|
||||||
|
|
||||||
puts %("#{data["name"].to_s}" by "#{data["artists"][0]["name"].to_s}" downloaded.)
|
puts %("#{data["name"].to_s}" by "#{data["artists"][0]["name"].to_s}" downloaded.)
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Will organize the song into the user's provided music directory as
|
# Will organize the song into the user's provided music directory as
|
||||||
|
@ -94,7 +92,7 @@ class Song
|
||||||
# Must be called AFTER the song has been downloaded.
|
# Must be called AFTER the song has been downloaded.
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# s = Song.new("Bohemian Rhapsody", "Queen").grab_it()
|
# s = Song.new("Bohemian Rhapsody", "Queen").grab_it
|
||||||
# s.organize_it("/home/cooper/Music")
|
# s.organize_it("/home/cooper/Music")
|
||||||
# # Will move the mp3 file to
|
# # Will move the mp3 file to
|
||||||
# # /home/cooper/Music/Queen/A Night At The Opera/1 - Bohemian Rhapsody.mp3
|
# # /home/cooper/Music/Queen/A Night At The Opera/1 - Bohemian Rhapsody.mp3
|
||||||
|
@ -116,7 +114,7 @@ class Song
|
||||||
# called.
|
# called.
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# Song.new(...).provide_metadata(...).grab_it()
|
# Song.new(...).provide_metadata(...).grab_it
|
||||||
# ```
|
# ```
|
||||||
def provide_metadata(metadata : JSON::Any) : self
|
def provide_metadata(metadata : JSON::Any) : self
|
||||||
@metadata = metadata
|
@metadata = metadata
|
||||||
|
@ -128,8 +126,8 @@ class Song
|
||||||
# provide_client_keys are not called.
|
# provide_client_keys are not called.
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# Song.new(...).provide_spotify(SpotifySearcher.new()
|
# Song.new(...).provide_spotify(SpotifySearcher.new
|
||||||
# .authenticate("XXXXXXXXXX", "XXXXXXXXXXX")).grab_it()
|
# .authenticate("XXXXXXXXXX", "XXXXXXXXXXX")).grab_it
|
||||||
# ```
|
# ```
|
||||||
def provide_spotify(spotify : SpotifySearcher) : self
|
def provide_spotify(spotify : SpotifySearcher) : self
|
||||||
@spotify_searcher = spotify
|
@spotify_searcher = spotify
|
||||||
|
@ -140,7 +138,7 @@ class Song
|
||||||
# provide_spotify are not called.
|
# provide_spotify are not called.
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# Song.new(...).provide_client_keys("XXXXXXXXXX", "XXXXXXXXX").grab_it()
|
# Song.new(...).provide_client_keys("XXXXXXXXXX", "XXXXXXXXX").grab_it
|
||||||
# ```
|
# ```
|
||||||
def provide_client_keys(client_id : String, client_secret : String) : self
|
def provide_client_keys(client_id : String, client_secret : String) : self
|
||||||
@client_id = client_id
|
@client_id = client_id
|
||||||
|
|
|
@ -1,5 +1,4 @@
|
||||||
class Logger
|
class Logger
|
||||||
|
|
||||||
@done_signal = "---DONE---"
|
@done_signal = "---DONE---"
|
||||||
|
|
||||||
@command : String
|
@command : String
|
||||||
|
@ -34,7 +33,7 @@ class Logger
|
||||||
# end
|
# end
|
||||||
# end
|
# end
|
||||||
# ```
|
# ```
|
||||||
def start(delete_file=true, &block) : Bool
|
def start(delete_file = true, &block) : Bool
|
||||||
# Delete the log if it already exists
|
# Delete the log if it already exists
|
||||||
File.delete(@log_name) if File.exists?(@log_name)
|
File.delete(@log_name) if File.exists?(@log_name)
|
||||||
|
|
||||||
|
@ -68,12 +67,12 @@ class Logger
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
status = called.get()
|
status = called.get
|
||||||
if status == true && delete_file == true
|
if status == true && delete_file == true
|
||||||
log.delete()
|
log.delete
|
||||||
end
|
end
|
||||||
|
|
||||||
return called.get()
|
return called.get
|
||||||
end
|
end
|
||||||
|
|
||||||
# Reads each line of the file into an Array of Strings
|
# Reads each line of the file into an Array of Strings
|
||||||
|
|
|
@ -2,7 +2,6 @@ require "./logger"
|
||||||
require "../bottle/config"
|
require "../bottle/config"
|
||||||
|
|
||||||
module Ripper
|
module Ripper
|
||||||
|
|
||||||
extend self
|
extend self
|
||||||
|
|
||||||
BIN_LOC = Path[Config.binary_location]
|
BIN_LOC = Path[Config.binary_location]
|
||||||
|
@ -35,7 +34,6 @@ module Ripper
|
||||||
command += " #{option} #{options[option]}"
|
command += " #{option} #{options[option]}"
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
l = Logger.new(command, ".ripper.log")
|
l = Logger.new(command, ".ripper.log")
|
||||||
o = RipperOutputCensor.new
|
o = RipperOutputCensor.new
|
||||||
|
|
||||||
|
@ -64,6 +62,5 @@ module Ripper
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
|
@ -5,10 +5,9 @@ require "../bottle/config"
|
||||||
# t = Tags.new("bohem rap.mp3")
|
# t = Tags.new("bohem rap.mp3")
|
||||||
# t.add_album_art("a night at the opera album cover.jpg")
|
# t.add_album_art("a night at the opera album cover.jpg")
|
||||||
# t.add_text_tag("title", "Bohemian Rhapsody")
|
# t.add_text_tag("title", "Bohemian Rhapsody")
|
||||||
# t.save()
|
# t.save
|
||||||
# ```
|
# ```
|
||||||
class Tags
|
class Tags
|
||||||
|
|
||||||
# TODO: export this path to a config file
|
# TODO: export this path to a config file
|
||||||
@BIN_LOC = Config.binary_location
|
@BIN_LOC = Config.binary_location
|
||||||
@query_args = [] of String
|
@query_args = [] of String
|
||||||
|
@ -20,7 +19,6 @@ class Tags
|
||||||
end
|
end
|
||||||
|
|
||||||
@query_args.push(%(-i "#{@filename}"))
|
@query_args.push(%(-i "#{@filename}"))
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Add album art to the mp3. Album art must be added BEFORE text tags are.
|
# Add album art to the mp3. Album art must be added BEFORE text tags are.
|
||||||
|
|
|
@ -2,7 +2,7 @@ require "./bottle/cli"
|
||||||
|
|
||||||
def main
|
def main
|
||||||
cli = CLI.new(ARGV)
|
cli = CLI.new(ARGV)
|
||||||
cli.act_on_args()
|
cli.act_on_args
|
||||||
end
|
end
|
||||||
|
|
||||||
main()
|
main()
|
|
@ -15,14 +15,14 @@ class SpotifySearcher
|
||||||
# https://developer.spotify.com/documentation/general/guides/authorization-guide/#client-credentials-flow
|
# https://developer.spotify.com/documentation/general/guides/authorization-guide/#client-credentials-flow
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# SpotifySearcher.new().authorize("XXXXXXXXXX", "XXXXXXXXXX")
|
# SpotifySearcher.new.authorize("XXXXXXXXXX", "XXXXXXXXXX")
|
||||||
# ```
|
# ```
|
||||||
def authorize(client_id : String, client_secret : String) : self
|
def authorize(client_id : String, client_secret : String) : self
|
||||||
auth_url = "https://accounts.spotify.com/api/token"
|
auth_url = "https://accounts.spotify.com/api/token"
|
||||||
|
|
||||||
headers = HTTP::Headers{
|
headers = HTTP::Headers{
|
||||||
"Authorization" => "Basic " +
|
"Authorization" => "Basic " +
|
||||||
Base64.strict_encode "#{client_id}:#{client_secret}"
|
Base64.strict_encode "#{client_id}:#{client_secret}",
|
||||||
}
|
}
|
||||||
|
|
||||||
payload = "grant_type=client_credentials"
|
payload = "grant_type=client_credentials"
|
||||||
|
@ -33,7 +33,7 @@ class SpotifySearcher
|
||||||
access_token = JSON.parse(response.body)["access_token"]
|
access_token = JSON.parse(response.body)["access_token"]
|
||||||
|
|
||||||
@access_header = HTTP::Headers{
|
@access_header = HTTP::Headers{
|
||||||
"Authorization" => "Bearer #{access_token}"
|
"Authorization" => "Bearer #{access_token}",
|
||||||
}
|
}
|
||||||
|
|
||||||
@authorized = true
|
@authorized = true
|
||||||
|
@ -55,12 +55,11 @@ class SpotifySearcher
|
||||||
# })
|
# })
|
||||||
# => {track metadata}
|
# => {track metadata}
|
||||||
# ```
|
# ```
|
||||||
def find_item(item_type : String, item_parameters : Hash, offset=0,
|
def find_item(item_type : String, item_parameters : Hash, offset = 0,
|
||||||
limit=20) : JSON::Any?
|
limit = 20) : JSON::Any?
|
||||||
|
|
||||||
query = generate_query(item_type, item_parameters, offset, limit)
|
query = generate_query(item_type, item_parameters, offset, limit)
|
||||||
|
|
||||||
url = @root_url.join("search?q=#{query}").to_s()
|
url = @root_url.join("search?q=#{query}").to_s
|
||||||
|
|
||||||
response = HTTP::Client.get(url, headers: @access_header)
|
response = HTTP::Client.get(url, headers: @access_header)
|
||||||
error_check(response)
|
error_check(response)
|
||||||
|
@ -100,9 +99,8 @@ class SpotifySearcher
|
||||||
# spotify_searcher.find_user_playlist("prakkillian", "the little man")
|
# spotify_searcher.find_user_playlist("prakkillian", "the little man")
|
||||||
# => {playlist metadata}
|
# => {playlist metadata}
|
||||||
# ```
|
# ```
|
||||||
def find_user_playlist(username : String, name : String, offset=0,
|
def find_user_playlist(username : String, name : String, offset = 0,
|
||||||
limit=20) : JSON::Any?
|
limit = 20) : JSON::Any?
|
||||||
|
|
||||||
url = "users/#{username}/playlists?limit=#{limit}&offset=#{offset}"
|
url = "users/#{username}/playlists?limit=#{limit}&offset=#{offset}"
|
||||||
url = @root_url.join(url).to_s
|
url = @root_url.join(url).to_s
|
||||||
|
|
||||||
|
@ -116,7 +114,7 @@ class SpotifySearcher
|
||||||
items.as_a.each_index do |i|
|
items.as_a.each_index do |i|
|
||||||
points.push([points_compare(items[i]["name"].to_s, name), i])
|
points.push([points_compare(items[i]["name"].to_s, name), i])
|
||||||
end
|
end
|
||||||
points.sort!{ |a, b| b[0] <=> a[0] }
|
points.sort! { |a, b| b[0] <=> a[0] }
|
||||||
|
|
||||||
begin
|
begin
|
||||||
if points[0][0] < 3
|
if points[0][0] < 3
|
||||||
|
@ -132,17 +130,16 @@ class SpotifySearcher
|
||||||
# Get the complete metadata of an item based off of its id
|
# Get the complete metadata of an item based off of its id
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# SpotifySearcher.new().authorize(...).get_item("artist", "1dfeR4HaWDbWqFHLkxsg1d")
|
# SpotifySearcher.new.authorize(...).get_item("artist", "1dfeR4HaWDbWqFHLkxsg1d")
|
||||||
# ```
|
# ```
|
||||||
def get_item(item_type : String, id : String, offset=0,
|
def get_item(item_type : String, id : String, offset = 0,
|
||||||
limit=100) : JSON::Any
|
limit = 100) : JSON::Any
|
||||||
|
|
||||||
if item_type == "playlist"
|
if item_type == "playlist"
|
||||||
return get_playlist(id, offset, limit)
|
return get_playlist(id, offset, limit)
|
||||||
end
|
end
|
||||||
|
|
||||||
url = "#{item_type}s/#{id}?limit=#{limit}&offset=#{offset}"
|
url = "#{item_type}s/#{id}?limit=#{limit}&offset=#{offset}"
|
||||||
url = @root_url.join(url).to_s()
|
url = @root_url.join(url).to_s
|
||||||
|
|
||||||
response = HTTP::Client.get(url, headers: @access_header)
|
response = HTTP::Client.get(url, headers: @access_header)
|
||||||
error_check(response)
|
error_check(response)
|
||||||
|
@ -156,11 +153,11 @@ class SpotifySearcher
|
||||||
# insert ALL tracks from the playlist into the `JSON::Any`
|
# insert ALL tracks from the playlist into the `JSON::Any`
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# SpotifySearcher.new().authorize(...).get_playlist("122Fc9gVuSZoksEjKEx7L0")
|
# SpotifySearcher.new.authorize(...).get_playlist("122Fc9gVuSZoksEjKEx7L0")
|
||||||
# ```
|
# ```
|
||||||
def get_playlist(id, offset=0, limit=100) : JSON::Any
|
def get_playlist(id, offset = 0, limit = 100) : JSON::Any
|
||||||
url = "playlists/#{id}?limit=#{limit}&offset=#{offset}"
|
url = "playlists/#{id}?limit=#{limit}&offset=#{offset}"
|
||||||
url = @root_url.join(url).to_s()
|
url = @root_url.join(url).to_s
|
||||||
|
|
||||||
response = HTTP::Client.get(url, headers: @access_header)
|
response = HTTP::Client.get(url, headers: @access_header)
|
||||||
error_check(response)
|
error_check(response)
|
||||||
|
@ -169,7 +166,7 @@ class SpotifySearcher
|
||||||
|
|
||||||
more_tracks = body["tracks"]["total"].as_i > offset + limit
|
more_tracks = body["tracks"]["total"].as_i > offset + limit
|
||||||
if more_tracks
|
if more_tracks
|
||||||
return playlist_extension(parent, id, offset=offset + limit)
|
return playlist_extension(parent, id, offset = offset + limit)
|
||||||
end
|
end
|
||||||
|
|
||||||
return body
|
return body
|
||||||
|
@ -178,9 +175,9 @@ class SpotifySearcher
|
||||||
# This method exists to loop through spotify API requests and combine all
|
# This method exists to loop through spotify API requests and combine all
|
||||||
# tracks that may not be captured by the limit of 100.
|
# tracks that may not be captured by the limit of 100.
|
||||||
private def playlist_extension(parent : PlaylistExtensionMapper,
|
private def playlist_extension(parent : PlaylistExtensionMapper,
|
||||||
id : String, offset=0, limit=100) : JSON::Any
|
id : String, offset = 0, limit = 100) : JSON::Any
|
||||||
url = "playlists/#{id}/tracks?limit=#{limit}&offset=#{offset}"
|
url = "playlists/#{id}/tracks?limit=#{limit}&offset=#{offset}"
|
||||||
url = @root_url.join(url).to_s()
|
url = @root_url.join(url).to_s
|
||||||
|
|
||||||
response = HTTP::Client.get(url, headers: @access_header)
|
response = HTTP::Client.get(url, headers: @access_header)
|
||||||
error_check(response)
|
error_check(response)
|
||||||
|
@ -193,7 +190,7 @@ class SpotifySearcher
|
||||||
|
|
||||||
more_tracks = body["total"].as_i > offset + limit
|
more_tracks = body["total"].as_i > offset + limit
|
||||||
if more_tracks
|
if more_tracks
|
||||||
return playlist_extension(parent, id, offset=offset + limit)
|
return playlist_extension(parent, id, offset = offset + limit)
|
||||||
end
|
end
|
||||||
|
|
||||||
return JSON.parse(parent.to_json)
|
return JSON.parse(parent.to_json)
|
||||||
|
@ -202,10 +199,9 @@ class SpotifySearcher
|
||||||
# Find the genre of an artist based off of their id
|
# Find the genre of an artist based off of their id
|
||||||
#
|
#
|
||||||
# ```
|
# ```
|
||||||
# SpotifySearcher.new().authorize(...).find_genre("1dfeR4HaWDbWqFHLkxsg1d")
|
# SpotifySearcher.new.authorize(...).find_genre("1dfeR4HaWDbWqFHLkxsg1d")
|
||||||
# ```
|
# ```
|
||||||
def find_genre(id : String) : String
|
def find_genre(id : String) : String
|
||||||
|
|
||||||
genre = get_item("artist", id)["genres"][0].to_s
|
genre = get_item("artist", id)["genres"][0].to_s
|
||||||
genre = genre.split(" ").map { |x| x.capitalize }.join(" ")
|
genre = genre.split(" ").map { |x| x.capitalize }.join(" ")
|
||||||
|
|
||||||
|
@ -234,7 +230,6 @@ class SpotifySearcher
|
||||||
item_parameters.keys.each do |k|
|
item_parameters.keys.each do |k|
|
||||||
# This will map album and track names from the name key to the query
|
# This will map album and track names from the name key to the query
|
||||||
if k == "name"
|
if k == "name"
|
||||||
|
|
||||||
# will remove the "name:<title>" param from the query
|
# will remove the "name:<title>" param from the query
|
||||||
if item_type == "playlist"
|
if item_type == "playlist"
|
||||||
query += item_parameters[k].gsub(" ", "+") + "+"
|
query += item_parameters[k].gsub(" ", "+") + "+"
|
||||||
|
@ -299,7 +294,7 @@ class SpotifySearcher
|
||||||
index += 1
|
index += 1
|
||||||
end
|
end
|
||||||
|
|
||||||
points.sort!{ |a, b| b[0] <=> a[0] }
|
points.sort! { |a, b| b[0] <=> a[0] }
|
||||||
|
|
||||||
return points
|
return points
|
||||||
end
|
end
|
||||||
|
@ -332,10 +327,8 @@ class SpotifySearcher
|
||||||
private def param_encode(key : String, value : String) : String
|
private def param_encode(key : String, value : String) : String
|
||||||
return key.gsub(" ", "+") + ":" + value.gsub(" ", "+") + "+"
|
return key.gsub(" ", "+") + ":" + value.gsub(" ", "+") + "+"
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
# puts SpotifySearcher.new()
|
# puts SpotifySearcher.new()
|
||||||
# .authorize("XXXXXXXXXXXXXXX",
|
# .authorize("XXXXXXXXXXXXXXX",
|
||||||
# "XXXXXXXXXXXXXXX")
|
# "XXXXXXXXXXXXXXX")
|
||||||
|
|
|
@ -1,24 +1,22 @@
|
||||||
require "http"
|
require "http"
|
||||||
require "xml"
|
require "xml"
|
||||||
|
|
||||||
|
|
||||||
module Youtube
|
module Youtube
|
||||||
|
|
||||||
extend self
|
extend self
|
||||||
|
|
||||||
VALID_LINK_CLASSES = [
|
VALID_LINK_CLASSES = [
|
||||||
"yt-simple-endpoint style-scope ytd-video-renderer",
|
"yt-simple-endpoint style-scope ytd-video-renderer",
|
||||||
"yt-uix-tile-link yt-ui-ellipsis yt-ui-ellipsis-2 yt-uix-sessionlink spf-link "
|
"yt-uix-tile-link yt-ui-ellipsis yt-ui-ellipsis-2 yt-uix-sessionlink spf-link ",
|
||||||
]
|
]
|
||||||
|
|
||||||
GARBAGE_PHRASES = [
|
GARBAGE_PHRASES = [
|
||||||
"cover", "album", "live", "clean", "version", "full", "full album", "row",
|
"cover", "album", "live", "clean", "version", "full", "full album", "row",
|
||||||
"at", "@", "session", "how to", "npr music", "reimagined", "hr version",
|
"at", "@", "session", "how to", "npr music", "reimagined", "hr version",
|
||||||
"trailer"
|
"trailer",
|
||||||
]
|
]
|
||||||
|
|
||||||
GOLDEN_PHRASES = [
|
GOLDEN_PHRASES = [
|
||||||
"official video", "official music video"
|
"official video", "official music video",
|
||||||
]
|
]
|
||||||
|
|
||||||
# Finds a youtube url based off of the given information.
|
# Finds a youtube url based off of the given information.
|
||||||
|
@ -78,14 +76,13 @@ module Youtube
|
||||||
|
|
||||||
points.push({
|
points.push({
|
||||||
"points" => pts,
|
"points" => pts,
|
||||||
"index" => index
|
"index" => index,
|
||||||
})
|
})
|
||||||
index += 1
|
index += 1
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
# Sort first by points and then by original index of the song
|
# Sort first by points and then by original index of the song
|
||||||
points.sort!{ |a, b|
|
points.sort! { |a, b|
|
||||||
if b["points"] == a["points"]
|
if b["points"] == a["points"]
|
||||||
a["index"] <=> b["index"]
|
a["index"] <=> b["index"]
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue