From dc4a6f87347440e310b739465ec6e2397c742af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Ankarstr=C3=B6m?= Date: Tue, 24 Nov 2020 03:08:20 +0100 Subject: Move dz/*, lf/* into root directory They are differentiated by the dz/lf prefix anyway. --- Makefile | 2 +- dz/dzq | 17 ----------------- dzq | 17 +++++++++++++++++ lf/lfp | 10 ---------- lf/lfq | 38 -------------------------------------- lf/lfs | 19 ------------------- lfp | 10 ++++++++++ lfq | 38 ++++++++++++++++++++++++++++++++++++++ lfs | 19 +++++++++++++++++++ 9 files changed, 85 insertions(+), 85 deletions(-) delete mode 100755 dz/dzq create mode 100755 dzq delete mode 100755 lf/lfp delete mode 100755 lf/lfq delete mode 100755 lf/lfs create mode 100755 lfp create mode 100755 lfq create mode 100755 lfs diff --git a/Makefile b/Makefile index fa1cf2d..dc23e0c 100644 --- a/Makefile +++ b/Makefile @@ -1,2 +1,2 @@ install: - install dz/* lf/* flt sim /usr/local/bin/ + install dz* lf* flt sim /usr/local/bin/ diff --git a/dz/dzq b/dz/dzq deleted file mode 100755 index bca7adc..0000000 --- a/dz/dzq +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -# Search Deezer - -test -z "$1" && { echo usage: $0 query 1>&2; exit 1; } -q=`printf '%s' "$1" | jq -sRr @uri` - -rm /tmp/dzq 2> /dev/null - -curl -s "https://www.deezer.com/search/$q" | -grep __DZR_APP_STATE__ | -cut -d= -f2- | -jq -r '.TRACK.data[] | .SNG_TITLE + "\t" + .ART_NAME + "\t" + .ALB_TITLE + "\t" + .SNG_ID' 2>&- | -sed 's/ */ /g' | -head -${2:-10} | -nl -w 2 | -tee -a /tmp/dzq diff --git a/dzq b/dzq new file mode 100755 index 0000000..bca7adc --- /dev/null +++ b/dzq @@ -0,0 +1,17 @@ +#!/bin/sh + +# Search Deezer + +test -z "$1" && { echo usage: $0 query 1>&2; exit 1; } +q=`printf '%s' "$1" | jq -sRr @uri` + +rm /tmp/dzq 2> /dev/null + +curl -s "https://www.deezer.com/search/$q" | +grep __DZR_APP_STATE__ | +cut -d= -f2- | +jq -r '.TRACK.data[] | .SNG_TITLE + "\t" + .ART_NAME + "\t" + .ALB_TITLE + "\t" + .SNG_ID' 2>&- | +sed 's/ */ /g' | +head -${2:-10} | +nl -w 2 | +tee -a /tmp/dzq diff --git a/lf/lfp b/lf/lfp deleted file mode 100755 index cd21b04..0000000 --- a/lf/lfp +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -# Parse Last.fm URL, print title - artist - -while read url -do - printf '%b\n' "$(printf '%s\n' "$url" | sed 's/+/ /g; s/%/\\\\x/g')" | - cut -d/ -f5,7 | - sed 's,^\(.*\)/\(.*\),\2 - \1,' -done diff --git a/lf/lfq b/lf/lfq deleted file mode 100755 index 81dbfb1..0000000 --- a/lf/lfq +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh - -# Search for track(s) on Last.fm, retrieve URL(s) - -usage() { echo usage: $0 [-m max] base-url 1>&2; exit 1; } - -# Parse options -m=10 -while getopts m: o -do - case $o in - m) m=$OPTARG ;; # max - ?) usage - esac -done -shift $((OPTIND-1)) -q=$1 - -m=$((m+0)) -test $m -lt 1 && m=10 - -# Retrieve search results -curl -s -G --data-urlencode "q=$q" 'https://www.last.fm/search/tracks' | -sed '/^[ ]*$/d' | -awk -F \" ' - /class="chartlist-name"/ { - getline; - getline; - getline; - getline; - getline; - getline; - print $2; - i++; - if (i > '"$((m-1))"') exit; - } -' | -sed 's,^,https://www.last.fm,' diff --git a/lf/lfs b/lf/lfs deleted file mode 100755 index 112e994..0000000 --- a/lf/lfs +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/sh - -# Get similar songs from Last.fm - -usage() { echo usage: $0 base-url 1>&2; exit 1; } - -url=$1 - -# Retrieve similar songs -curl -s "$url" | -sed '/^[ ]*$/d' | -awk -F \" ' - /class="track-similar-tracks-item-name"/ { - getline; - getline; - print $2; - } -' | -sed 's,^,https://www.last.fm,' diff --git a/lfp b/lfp new file mode 100755 index 0000000..cd21b04 --- /dev/null +++ b/lfp @@ -0,0 +1,10 @@ +#!/bin/sh + +# Parse Last.fm URL, print title - artist + +while read url +do + printf '%b\n' "$(printf '%s\n' "$url" | sed 's/+/ /g; s/%/\\\\x/g')" | + cut -d/ -f5,7 | + sed 's,^\(.*\)/\(.*\),\2 - \1,' +done diff --git a/lfq b/lfq new file mode 100755 index 0000000..81dbfb1 --- /dev/null +++ b/lfq @@ -0,0 +1,38 @@ +#!/bin/sh + +# Search for track(s) on Last.fm, retrieve URL(s) + +usage() { echo usage: $0 [-m max] base-url 1>&2; exit 1; } + +# Parse options +m=10 +while getopts m: o +do + case $o in + m) m=$OPTARG ;; # max + ?) usage + esac +done +shift $((OPTIND-1)) +q=$1 + +m=$((m+0)) +test $m -lt 1 && m=10 + +# Retrieve search results +curl -s -G --data-urlencode "q=$q" 'https://www.last.fm/search/tracks' | +sed '/^[ ]*$/d' | +awk -F \" ' + /class="chartlist-name"/ { + getline; + getline; + getline; + getline; + getline; + getline; + print $2; + i++; + if (i > '"$((m-1))"') exit; + } +' | +sed 's,^,https://www.last.fm,' diff --git a/lfs b/lfs new file mode 100755 index 0000000..112e994 --- /dev/null +++ b/lfs @@ -0,0 +1,19 @@ +#!/bin/sh + +# Get similar songs from Last.fm + +usage() { echo usage: $0 base-url 1>&2; exit 1; } + +url=$1 + +# Retrieve similar songs +curl -s "$url" | +sed '/^[ ]*$/d' | +awk -F \" ' + /class="track-similar-tracks-item-name"/ { + getline; + getline; + print $2; + } +' | +sed 's,^,https://www.last.fm,' -- cgit v1.2.3