Merge pull request #203358 from mausch/pianoteq

pianoteq: fixes and upgrade
This commit is contained in:
Vlad M 2023-01-30 12:49:53 +02:00 committed by GitHub
commit d09befcf4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -93,14 +93,11 @@ let
fetchWithCurlScript { fetchWithCurlScript {
inherit name sha256; inherit name sha256;
script = '' script = ''
"''${curl[@]}" --silent --request POST \ "''${curl[@]}" --silent --request GET \
--cookie cookies \ --cookie cookies \
--header "modartt-json: request" \ --header "accept: */*" \
--header "origin: https://www.modartt.com" \ https://www.modartt.com/ -o /dev/null
--header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \
--data-raw '{"file": "${name}", "get": "url"}' \
https://www.modartt.com/json/download -o /dev/null
json=$( json=$(
"''${curl[@]}" --silent --request POST \ "''${curl[@]}" --silent --request POST \
--cookie cookies \ --cookie cookies \
@ -109,8 +106,9 @@ let
--header "content-type: application/json; charset=UTF-8" \ --header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \ --header "accept: application/json, text/javascript, */*" \
--data-raw '{"file": "${name}", "get": "url"}' \ --data-raw '{"file": "${name}", "get": "url"}' \
https://www.modartt.com/json/download https://www.modartt.com/api/0/download
) )
url=$(echo $json | ${jq}/bin/jq -r .url) url=$(echo $json | ${jq}/bin/jq -r .url)
"''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url"
''; '';
@ -140,7 +138,7 @@ let
--header "content-type: application/json; charset=UTF-8" \ --header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \ --header "accept: application/json, text/javascript, */*" \
--data @login.json \ --data @login.json \
https://www.modartt.com/json/session https://www.modartt.com/api/0/session
json=$( json=$(
"''${curl[@]}" --silent --request POST \ "''${curl[@]}" --silent --request POST \
@ -150,10 +148,10 @@ let
--header "content-type: application/json; charset=UTF-8" \ --header "content-type: application/json; charset=UTF-8" \
--header "accept: application/json, text/javascript, */*" \ --header "accept: application/json, text/javascript, */*" \
--data-raw '{"file": "${name}", "get": "url"}' \ --data-raw '{"file": "${name}", "get": "url"}' \
https://www.modartt.com/json/download https://www.modartt.com/api/0/download
) )
url=$(echo $json | ${jq}/bin/jq -r .url)
url=$(echo $json | ${jq}/bin/jq -r .url)
"''${curl[@]}" --progress-bar --cookie cookies -o $out "$url" "''${curl[@]}" --progress-bar --cookie cookies -o $out "$url"
''; '';
}; };
@ -162,20 +160,20 @@ in {
# TODO currently can't install more than one because `lame` clashes # TODO currently can't install more than one because `lame` clashes
stage-trial = mkPianoteq rec { stage-trial = mkPianoteq rec {
name = "stage-trial"; name = "stage-trial";
version = "7.5.4"; version = "8.0.5";
archdir = "x86-64bit"; archdir = "x86-64bit";
src = fetchPianoteqTrial { src = fetchPianoteqTrial {
name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z"; name = "pianoteq_stage_linux_trial_v${versionForFile version}.7z";
sha256 = "sha256-ybtq+hjnaQxpLxv2KE0ZcbQXtn5DJJsnMwCmh3rlrIc="; sha256 = "sha256-9Lo4e1SM1gw2/+TmpDUdZCOQcHEpT/aaG6P80/GRPQY=";
}; };
}; };
standard-trial = mkPianoteq rec { standard-trial = mkPianoteq rec {
name = "standard-trial"; name = "standard-trial";
version = "7.5.4"; version = "8.0.5";
archdir = "x86-64bit"; archdir = "x86-64bit";
src = fetchPianoteqTrial { src = fetchPianoteqTrial {
name = "pianoteq_linux_trial_v${versionForFile version}.7z"; name = "pianoteq_linux_trial_v${versionForFile version}.7z";
sha256 = "sha256-3a3+SKTEhvDtqK5Kg4E6KiLvn5+j6JN6ntIb72u2bdQ="; sha256 = "sha256-qxViVIbld8zTMj1+TIfOsIOhmujOGJux2/u2J4hvsqw=";
}; };
}; };
stage-6 = mkPianoteq rec { stage-6 = mkPianoteq rec {