cromer/pamac-classic
2
0
Fork 3
Code Issues 2 Pull Requests 1 Releases 13 Wiki Activity

fix #224

Browse Source
This commit is contained in:
guinux 2017-03-08 16:07:53 +01:00
parent 0b277b839f
commit 888d541197
1 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/daemon.vala
View File

@ -163,6 +163,7 @@ namespace Pamac {
Timeout.add (500, check_pacman_running); Timeout.add (500, check_pacman_running);
create_thread_pool (); create_thread_pool ();
cancellable = new Cancellable (); cancellable = new Cancellable ();
curl = new Curl.Easy ();
} }
public void set_environment_variables (HashTable<string,string> variables) { public void set_environment_variables (HashTable<string,string> variables) {
@ -202,19 +203,6 @@ namespace Pamac {
} }
} }
public void init_curl () {
curl = new Curl.Easy ();
curl->setopt (Curl.Option.FAILONERROR, 1L);
curl->setopt (Curl.Option.CONNECTTIMEOUT, 30L);
curl->setopt (Curl.Option.FILETIME, 1L);
curl->setopt (Curl.Option.FOLLOWLOCATION, 1L);
curl->setopt (Curl.Option.XFERINFOFUNCTION, cb_download);
curl->setopt (Curl.Option.LOW_SPEED_LIMIT, 1L);
curl->setopt (Curl.Option.LOW_SPEED_TIME, 30L);
curl->setopt (Curl.Option.NETRC, Curl.NetRCOption.OPTIONAL);
curl->setopt (Curl.Option.HTTPAUTH, Curl.CURLAUTH_ANY);
}
private void refresh_handle () { private void refresh_handle () {
alpm_handle = alpm_config.get_handle (); alpm_handle = alpm_config.get_handle ();
if (alpm_handle == null) { if (alpm_handle == null) {
@ -434,7 +422,6 @@ namespace Pamac {
int force = (force_refresh) ? 1 : 0; int force = (force_refresh) ? 1 : 0;
uint success = 0; uint success = 0;
cancellable.reset (); cancellable.reset ();
init_curl ();
string[] dbexts = {".db", ".files"}; string[] dbexts = {".db", ".files"};
unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs; unowned Alpm.List<unowned Alpm.DB> syncdbs = alpm_handle.syncdbs;
while (syncdbs != null) { while (syncdbs != null) {
@ -2276,19 +2263,6 @@ private void cb_event (Alpm.Event.Data data) {
details += data.delta_patch_delta.to; details += data.delta_patch_delta.to;
details += data.delta_patch_delta.delta; details += data.delta_patch_delta.delta;
break; break;
case Alpm.Event.Type.RETRIEVE_START:
// init curl easy handle
pamac_daemon.curl = new Curl.Easy ();
pamac_daemon.curl->setopt (Curl.Option.FAILONERROR, 1L);
pamac_daemon.curl->setopt (Curl.Option.CONNECTTIMEOUT, 30L);
pamac_daemon.curl->setopt (Curl.Option.FILETIME, 1L);
pamac_daemon.curl->setopt (Curl.Option.FOLLOWLOCATION, 1L);
pamac_daemon.curl->setopt (Curl.Option.XFERINFOFUNCTION, cb_download);
pamac_daemon.curl->setopt (Curl.Option.LOW_SPEED_LIMIT, 1L);
pamac_daemon.curl->setopt (Curl.Option.LOW_SPEED_TIME, 30L);
pamac_daemon.curl->setopt (Curl.Option.NETRC, Curl.NetRCOption.OPTIONAL);
pamac_daemon.curl->setopt (Curl.Option.HTTPAUTH, Curl.CURLAUTH_ANY);
break;
case Alpm.Event.Type.RETRIEVE_DONE: case Alpm.Event.Type.RETRIEVE_DONE:
delete pamac_daemon.curl; delete pamac_daemon.curl;
break; break;
@ -2437,13 +2411,20 @@ private int cb_fetch (string fileurl, string localpath, int force) {
var destfile = GLib.File.new_for_path (localpath + url.get_basename ()); var destfile = GLib.File.new_for_path (localpath + url.get_basename ());
var tempfile = GLib.File.new_for_path (destfile.get_path () + ".part"); var tempfile = GLib.File.new_for_path (destfile.get_path () + ".part");
pamac_daemon.curl->reset ();
pamac_daemon.curl->setopt (Curl.Option.FAILONERROR, 1L);
pamac_daemon.curl->setopt (Curl.Option.CONNECTTIMEOUT, 30L);
pamac_daemon.curl->setopt (Curl.Option.FILETIME, 1L);
pamac_daemon.curl->setopt (Curl.Option.FOLLOWLOCATION, 1L);
pamac_daemon.curl->setopt (Curl.Option.XFERINFOFUNCTION, cb_download);
pamac_daemon.curl->setopt (Curl.Option.LOW_SPEED_LIMIT, 1L);
pamac_daemon.curl->setopt (Curl.Option.LOW_SPEED_TIME, 30L);
pamac_daemon.curl->setopt (Curl.Option.NETRC, Curl.NetRCOption.OPTIONAL);
pamac_daemon.curl->setopt (Curl.Option.HTTPAUTH, Curl.CURLAUTH_ANY);
pamac_daemon.curl->setopt (Curl.Option.URL, fileurl); pamac_daemon.curl->setopt (Curl.Option.URL, fileurl);
pamac_daemon.curl->setopt (Curl.Option.ERRORBUFFER, error_buffer); pamac_daemon.curl->setopt (Curl.Option.ERRORBUFFER, error_buffer);
pamac_daemon.curl->setopt (Curl.Option.NOPROGRESS, 0L); pamac_daemon.curl->setopt (Curl.Option.NOPROGRESS, 0L);
pamac_daemon.curl->setopt (Curl.Option.XFERINFODATA, (void*) url.get_basename ()); pamac_daemon.curl->setopt (Curl.Option.XFERINFODATA, (void*) url.get_basename ());
pamac_daemon.curl->setopt (Curl.Option.TIMECONDITION, Curl.TimeCond.NONE);
pamac_daemon.curl->setopt (Curl.Option.TIMEVALUE, 0);
pamac_daemon.curl->setopt (Curl.Option.RESUME_FROM_LARGE, 0);
bool remove_partial_download = true; bool remove_partial_download = true;
if (fileurl.contains (".pkg.tar.") && !fileurl.has_suffix (".sig")) { if (fileurl.contains (".pkg.tar.") && !fileurl.has_suffix (".sig")) {