ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

library mgmt API tweaks

Browse Source
This commit is contained in:
Paul Davis 2022-09-08 18:18:53 -06:00
parent 5c52112319
commit 76f44c6025
2 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/library.h
View File

@ -63,6 +63,7 @@ class LibraryDescription
class Downloader {
public:
Downloader (std::string const & url, std::string const & destdir);
~Downloader ();
int start ();
void cleanup ();

12
libs/ardour/library.cc
View File

@ -22,6 +22,7 @@
#include <glibmm/fileutils.h>
#include <glibmm/miscutils.h>
#include "pbd/error.h"
#include "pbd/i18n.h"
#include "pbd/file_archive.h"
#include "pbd/replace_all.h"
@ -240,6 +241,11 @@ Downloader::Downloader (string const & u, string const & dir)
{
}
Downloader::~Downloader ()
{
cleanup();
}
int
Downloader::start ()
{
@ -266,7 +272,6 @@ void
Downloader::cancel ()
{
_cancel = true;
cleanup ();
}
double
@ -278,6 +283,8 @@ Downloader::progress () const
void
Downloader::download ()
{
char curl_error[CURL_ERROR_SIZE];
{
/* First curl fetch to get the data size so that we can offer a
* progress meter
@ -291,9 +298,11 @@ Downloader::download ()
/* get size */
curl_easy_setopt (curl, CURLOPT_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_NOBODY, 1L);
curl_easy_setopt(curl, CURLOPT_HEADER, 0L);
curl_easy_setopt (curl, CURLOPT_FOLLOWLOCATION, 1L);
curl_easy_setopt (curl, CURLOPT_ERRORBUFFER, curl_error);
CURLcode res = curl_easy_perform (curl);
@ -306,6 +315,7 @@ Downloader::download ()
curl_easy_cleanup (curl);
if (res != CURLE_OK ) {
error << string_compose (_("Download failed, error code %1 (%2)"), curl_easy_strerror (res), curl_error) << endmsg;
_status = -2;
return;
}