aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

[curl] Added download resume for curl's ftp

Browse Source
This commit is contained in:
Witold Filipczyk 2023-11-16 16:08:29 +01:00
parent dc1e67cc45
commit 1ff535370e
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/protocol/curl/ftp.c
View File

@ -401,8 +401,6 @@ do_ftpes(struct connection *conn)
if (!conn->uri->datalen || conn->uri->data[conn->uri->datalen - 1] == '/') { if (!conn->uri->datalen || conn->uri->data[conn->uri->datalen - 1] == '/') {
ftp->dir = 1; ftp->dir = 1;
} }
conn->from = 0;
conn->unrestartable = 1;
url = get_uri_string(conn->uri, URI_HOST | URI_PORT | URI_DATA); url = get_uri_string(conn->uri, URI_HOST | URI_PORT | URI_DATA);
if (!url) { if (!url) {
@ -437,7 +435,8 @@ do_ftpes(struct connection *conn)
if (curl) { if (curl) {
CURLMcode rc; CURLMcode rc;
curl_off_t offset = conn->progress->start > 0 ? conn->progress->start : 0;
conn->progress->seek = conn->from = offset;
ftp->easy = curl; ftp->easy = curl;
/* Define our callback to get called when there's data to be written */ /* Define our callback to get called when there's data to be written */
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, my_fwrite);
@ -445,7 +444,7 @@ do_ftpes(struct connection *conn)
curl_easy_setopt(curl, CURLOPT_WRITEDATA, conn); curl_easy_setopt(curl, CURLOPT_WRITEDATA, conn);
curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ftp->error); curl_easy_setopt(curl, CURLOPT_ERRORBUFFER, ftp->error);
curl_easy_setopt(curl, CURLOPT_PRIVATE, conn); curl_easy_setopt(curl, CURLOPT_PRIVATE, conn);
curl_easy_setopt(curl, CURLOPT_RESUME_FROM_LARGE, offset);
curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L); curl_easy_setopt(curl, CURLOPT_NOPROGRESS, 1L);
//curl_easy_setopt(curl, CURLOPT_XFERINFODATA, conn); //curl_easy_setopt(curl, CURLOPT_XFERINFODATA, conn);
@ -558,8 +557,13 @@ out_of_mem:
if (add_fragment(conn->cached, conn->from, buffer, len) == 1) { if (add_fragment(conn->cached, conn->from, buffer, len) == 1) {
conn->tries = 0; conn->tries = 0;
} }
if (conn->from == 0 && conn->est_length == -1) {
if ((conn->from == 0 || conn->progress->start > 0) && conn->est_length == -1) {
curl_easy_getinfo(ftp->easy, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &conn->est_length); curl_easy_getinfo(ftp->easy, CURLINFO_CONTENT_LENGTH_DOWNLOAD_T, &conn->est_length);
if (conn->est_length != -1) {
conn->est_length += conn->from;
}
} }
conn->from += len; conn->from += len;
conn->received += len; conn->received += len;