From 47c00af4d65f48bc46b31305b05470ac504a2e32 Mon Sep 17 00:00:00 2001 From: "A.Popov" Date: Mon, 30 Mar 2020 11:43:12 +0300 Subject: [PATCH 1/3] Transcribe config: removed key --- sys.config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys.config b/sys.config index 74771f3c1..eb0c1a0ae 100644 --- a/sys.config +++ b/sys.config @@ -42,7 +42,7 @@ ]}, {google_api, [ {gs_bucket, <<"transcribe-store">>}, - {key, <<"AIzaSyC-HHyIj9gwYLEK1tdcYC1AhCq5xie4lYc">>}, + {key, []}, {app_credentials, "etc/certs/transcribe-dacb4306ab76.json"} ]}, {push_api,[ -- GitLab From 700eed8c2a8fb98d9a1c2519aad0cc5eaca29380 Mon Sep 17 00:00:00 2001 From: "A.Popov" Date: Mon, 6 Apr 2020 11:12:37 +0300 Subject: [PATCH 2/3] downloaded filename should be unique, not timestamp --- apps/roster/src/api/google_api.erl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/roster/src/api/google_api.erl b/apps/roster/src/api/google_api.erl index a0f5d4591..67ec72f4c 100644 --- a/apps/roster/src/api/google_api.erl +++ b/apps/roster/src/api/google_api.erl @@ -206,7 +206,8 @@ send_operation(LongRequest, OperationName, Counter, Timeout, Fun) -> download(Uri) -> download(Uri, ?DOWNLOAD_TIMEOUT). download(Uri, Timeout) -> - case ibrowse:send_req(Uri, [], get, [], [{save_response_to_file, true}], Timeout) of + Filename = "./priv/tmp/ibrowse_tmp_file_"++ uuid:to_string(uuid:uuid4()), + case ibrowse:send_req(Uri, [], get, [], [{save_response_to_file, Filename}], Timeout) of {ok, "200", _, File} -> File; {ok, _, _, ErrString} = Res-> roster:error(?MODULE, "~p", [Res]), -- GitLab From 13db4bd7288cd04b363f499c81fcbfb8f3164e54 Mon Sep 17 00:00:00 2001 From: "A.Popov" Date: Thu, 9 Apr 2020 22:04:30 +0300 Subject: [PATCH 3/3] Extracted download directory in sys.config --- apps/roster/src/api/google_api.erl | 6 ++++-- sys.config | 1 + 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/roster/src/api/google_api.erl b/apps/roster/src/api/google_api.erl index 67ec72f4c..4b1ec4d47 100644 --- a/apps/roster/src/api/google_api.erl +++ b/apps/roster/src/api/google_api.erl @@ -18,6 +18,7 @@ -define(TOKEN_INFO_URL, "https://www.googleapis.com/oauth2/v3/tokeninfo?access_token="). -define(DOWNLOAD_TIMEOUT, 30000). +-define(DOWNLOAD_DIR, proplists:get_value(download_dir, application:get_env(roster, google_api, []), "/tmp/">>)). -define(GS_BUCKET, proplists:get_value(gs_bucket, application:get_env(roster, google_api, []), <<"cryoflamer">>)). -define(CONVERT_CMD, "ffmpeg -y -i ~s -acodec pcm_s16le -ac 1 -ar 16000 ~s.wav"). @@ -204,10 +205,11 @@ send_operation(LongRequest, OperationName, Counter, Timeout, Fun) -> {error, _} = Err -> Fun(Err) end. +gen_tmp_filename() -> filename:join(?DOWNLOAD_DIR, "ibrowse_tmp_file_"++ uuid:to_string(uuid:uuid4())). + download(Uri) -> download(Uri, ?DOWNLOAD_TIMEOUT). download(Uri, Timeout) -> - Filename = "./priv/tmp/ibrowse_tmp_file_"++ uuid:to_string(uuid:uuid4()), - case ibrowse:send_req(Uri, [], get, [], [{save_response_to_file, Filename}], Timeout) of + case ibrowse:send_req(Uri, [], get, [], [{save_response_to_file, gen_tmp_filename()}], Timeout) of {ok, "200", _, File} -> File; {ok, _, _, ErrString} = Res-> roster:error(?MODULE, "~p", [Res]), diff --git a/sys.config b/sys.config index eb0c1a0ae..483c4d2b9 100644 --- a/sys.config +++ b/sys.config @@ -41,6 +41,7 @@ ]} ]}, {google_api, [ + {download_dir, "./priv/tmp/"}, {gs_bucket, <<"transcribe-store">>}, {key, []}, {app_credentials, "etc/certs/transcribe-dacb4306ab76.json"} -- GitLab