heimoshuiyu/gonic
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

simpilufy shell scripts

Browse Source
This commit is contained in:
sentriz
2019-07-01 11:34:14 +01:00
parent 55b5290def
commit 862cf0f3a5
5 changed files with 42 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
_do_build_scanner
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
source _build_vars source ./_build_vars
go build \ go build \
-o gonicscan \ -o gonicscan \
-tags "$(tr '\n' ' ' < _build_tags)" \ -tags "$(tr '\n' ' ' < _build_tags)" \

2
_do_build_server
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
source _build_vars source ./_build_vars
find server/assets/ \ find server/assets/ \
-type f \ -type f \
-exec go run \ -exec go run \

29
_do_gen_handler_tests
View File

@@ -5,7 +5,7 @@ test_listen_addr=localhost:9353
test_music_path=~/music test_music_path=~/music
test_db_path=$test_data_path/db test_db_path=$test_data_path/db
if [[ "$1" == "--scan" ]]; then if test "$1" == "--scan"; then
echo -e "\e[91mwarning: \e[39mthe --scan option was passed" echo -e "\e[91mwarning: \e[39mthe --scan option was passed"
echo "- this option should only be used if the database schema changes" echo "- this option should only be used if the database schema changes"
echo "- the test json will likely change a lot" echo "- the test json will likely change a lot"
@@ -16,26 +16,17 @@ if [[ "$1" == "--scan" ]]; then
-db-path "$test_db_path" -db-path "$test_db_path"
fi fi
# start server in fd 3
mkdir "$test_music_path" 2>/dev/null mkdir "$test_music_path" 2>/dev/null
exec 3< <( echo "waiting for server to start"
./_do_run_server \ ./_do_run_server \
-music-path "$test_music_path" \ -music-path "$test_music_path" \
-db-path "$test_db_path" \ -db-path "$test_db_path" \
-listen-addr "$test_listen_addr" \ -listen-addr "$test_listen_addr" 2>&1 \
2>&1 | while read line; do
)
# wait for start message
echo "waiting for server to start"
while read line; do
echo "from server: $line" echo "from server: $line"
if [[ "$line" == *'starting server'* ]]; then if [[ "$line" == *'starting server'* ]]; then
break
fi
done <&3
sleep '0.5' sleep '0.5'
#
# by folder # by folder
curl -s "http://$test_listen_addr/rest/getAlbumList.view?c=c&f=json&p=admin&u=admin&v=v&type=alphabeticalByArtist" | jq > "$test_data_path/test_get_album_list_alpha_artist" curl -s "http://$test_listen_addr/rest/getAlbumList.view?c=c&f=json&p=admin&u=admin&v=v&type=alphabeticalByArtist" | jq > "$test_data_path/test_get_album_list_alpha_artist"
curl -s "http://$test_listen_addr/rest/getAlbumList.view?c=c&f=json&p=admin&u=admin&v=v&type=alphabeticalByName" | jq > "$test_data_path/test_get_album_list_alpha_name" curl -s "http://$test_listen_addr/rest/getAlbumList.view?c=c&f=json&p=admin&u=admin&v=v&type=alphabeticalByName" | jq > "$test_data_path/test_get_album_list_alpha_name"
@@ -48,7 +39,7 @@ curl -s "http://$test_listen_addr/rest/search2.view?c=c&f=json&p=admin&u=admin&v
curl -s "http://$test_listen_addr/rest/getIndexes.view?c=c&p=admin&u=admin&v=v&f=json" | jq > "$test_data_path/test_get_indexes_no_args" curl -s "http://$test_listen_addr/rest/getIndexes.view?c=c&p=admin&u=admin&v=v&f=json" | jq > "$test_data_path/test_get_indexes_no_args"
curl -s "http://$test_listen_addr/rest/getMusicDirectory.view?c=Jamsstash&id=2&p=admin&u=admin&v=v&f=json" | jq > "$test_data_path/test_get_music_directory_without_tracks" curl -s "http://$test_listen_addr/rest/getMusicDirectory.view?c=Jamsstash&id=2&p=admin&u=admin&v=v&f=json" | jq > "$test_data_path/test_get_music_directory_without_tracks"
curl -s "http://$test_listen_addr/rest/getMusicDirectory.view?c=Jamsstash&id=3&p=admin&u=admin&v=v&f=json" | jq > "$test_data_path/test_get_music_directory_with_tracks" curl -s "http://$test_listen_addr/rest/getMusicDirectory.view?c=Jamsstash&id=3&p=admin&u=admin&v=v&f=json" | jq > "$test_data_path/test_get_music_directory_with_tracks"
#
# by tags # by tags
curl -s "http://$test_listen_addr/rest/getAlbum.view?c=c&f=json&p=admin&u=admin&v=v&id=2" | jq > "$test_data_path/test_get_album_without_cover" curl -s "http://$test_listen_addr/rest/getAlbum.view?c=c&f=json&p=admin&u=admin&v=v&id=2" | jq > "$test_data_path/test_get_album_without_cover"
curl -s "http://$test_listen_addr/rest/getAlbum.view?c=c&f=json&p=admin&u=admin&v=v&id=3" | jq > "$test_data_path/test_get_album_with_cover" curl -s "http://$test_listen_addr/rest/getAlbum.view?c=c&f=json&p=admin&u=admin&v=v&id=3" | jq > "$test_data_path/test_get_album_with_cover"
@@ -63,7 +54,7 @@ curl -s "http://$test_listen_addr/rest/getArtists.view?c=c&f=json&p=admin&u=admi
curl -s "http://$test_listen_addr/rest/search3.view?c=c&f=json&p=admin&u=admin&v=v&query=13" | jq > "$test_data_path/test_search_three_q_13" curl -s "http://$test_listen_addr/rest/search3.view?c=c&f=json&p=admin&u=admin&v=v&query=13" | jq > "$test_data_path/test_search_three_q_13"
curl -s "http://$test_listen_addr/rest/search3.view?c=c&f=json&p=admin&u=admin&v=v&query=ani" | jq > "$test_data_path/test_search_three_q_ani" curl -s "http://$test_listen_addr/rest/search3.view?c=c&f=json&p=admin&u=admin&v=v&query=ani" | jq > "$test_data_path/test_search_three_q_ani"
curl -s "http://$test_listen_addr/rest/search3.view?c=c&f=json&p=admin&u=admin&v=v&query=cert" | jq > "$test_data_path/test_search_three_q_cert" curl -s "http://$test_listen_addr/rest/search3.view?c=c&f=json&p=admin&u=admin&v=v&query=cert" | jq > "$test_data_path/test_search_three_q_cert"
#
# stop server pkill -INT -f "/tmp/go-build.*$test_listen_addr.*"
pkill -INT -f ".*go.*$test_listen_addr.*" fi
exec 3<&- done

2
_do_run_scanner
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
source _build_vars source ./_build_vars
go run \ go run \
-tags "$(tr '\n' ' ' < _build_tags)" \ -tags "$(tr '\n' ' ' < _build_tags)" \
cmd/gonicscan/main.go \ cmd/gonicscan/main.go \

2
_do_run_server
View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
source _build_vars source ./_build_vars
go run \ go run \
-tags "$(tr '\n' ' ' < _build_tags)" \ -tags "$(tr '\n' ' ' < _build_tags)" \
cmd/gonic/main.go \ cmd/gonic/main.go \