Skip to content

Commit

Permalink
Fixing worker and callbacks to follow actual alpm api
Browse files Browse the repository at this point in the history
  • Loading branch information
Elyess Zouaghi committed Sep 15, 2010
1 parent d94bbc6 commit 102a240
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 22 deletions.
30 changes: 15 additions & 15 deletions libaqpm/worker/Worker.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ void Worker::updateDatabase()
return;
}

if (alpm_trans_init(PM_TRANS_TYPE_SYNC, PM_TRANS_FLAG_ALLDEPS, AqpmWorker::cb_trans_evt,
if (alpm_trans_init(PM_TRANS_FLAG_ALLDEPS, AqpmWorker::cb_trans_evt,
AqpmWorker::cb_trans_conv, AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
args["ErrorString"] = QString(alpm_strerrorlast());
Expand Down Expand Up @@ -335,7 +335,7 @@ void Worker::processQueue(const QVariantList &packages, int flags)
}

if (remove) {
if (alpm_trans_init(PM_TRANS_TYPE_REMOVE, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand Down Expand Up @@ -364,7 +364,7 @@ void Worker::processQueue(const QVariantList &packages, int flags)
}

if (sync) {
if (alpm_trans_init(PM_TRANS_TYPE_SYNC, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand Down Expand Up @@ -394,7 +394,7 @@ void Worker::processQueue(const QVariantList &packages, int flags)
}

if (file) {
if (alpm_trans_init(PM_TRANS_TYPE_UPGRADE, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand Down Expand Up @@ -456,7 +456,7 @@ void Worker::downloadQueue(const QVariantList &packages)

qDebug() << "Packages appended, starting evaluation";

if (alpm_trans_init(PM_TRANS_TYPE_SYNC, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand All @@ -470,7 +470,7 @@ void Worker::downloadQueue(const QVariantList &packages)

foreach(const Aqpm::QueueItem &itm, queue) {
if (itm.action_id == Aqpm::QueueItem::FullUpgrade) {
if (alpm_trans_sysupgrade(0) == -1) {
if (alpm_sync_sysupgrade(0) == -1) {
qDebug() << "Creating a sysupgrade transaction failed!!";
QVariantMap args;
args["ErrorString"] = QString(alpm_strerrorlast());
Expand Down Expand Up @@ -564,7 +564,7 @@ void Worker::retrieveTargetsForQueue(const QVariantList &packages, int flags)
}

if (remove) {
if (alpm_trans_init(PM_TRANS_TYPE_REMOVE, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand Down Expand Up @@ -595,7 +595,7 @@ void Worker::retrieveTargetsForQueue(const QVariantList &packages, int flags)
return;
}

retlist += targets(alpm_trans_get_pkgs(), Aqpm::QueueItem::Remove);
retlist += targets(alpm_trans_get_remove(), Aqpm::QueueItem::Remove);

if(data) {
FREELIST(data);
Expand All @@ -605,7 +605,7 @@ void Worker::retrieveTargetsForQueue(const QVariantList &packages, int flags)
}

if (sync) {
if (alpm_trans_init(PM_TRANS_TYPE_SYNC, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand Down Expand Up @@ -638,7 +638,7 @@ void Worker::retrieveTargetsForQueue(const QVariantList &packages, int flags)
return;
}

retlist += targets(alpm_trans_get_pkgs(), Aqpm::QueueItem::Sync);
retlist += targets(alpm_trans_get_add(), Aqpm::QueueItem::Sync);

if(data) {
FREELIST(data);
Expand All @@ -648,7 +648,7 @@ void Worker::retrieveTargetsForQueue(const QVariantList &packages, int flags)
}

if (file) {
if (alpm_trans_init(PM_TRANS_TYPE_UPGRADE, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand Down Expand Up @@ -679,7 +679,7 @@ void Worker::retrieveTargetsForQueue(const QVariantList &packages, int flags)
return;
}

retlist += targets(alpm_trans_get_pkgs(), Aqpm::QueueItem::Sync);
retlist += targets(alpm_trans_get_add(), Aqpm::QueueItem::Sync);

if(data) {
FREELIST(data);
Expand Down Expand Up @@ -719,7 +719,7 @@ void Worker::systemUpgrade(int flags, bool downgrade)

qDebug() << alpmflags;

if (alpm_trans_init(PM_TRANS_TYPE_SYNC, alpmflags,
if (alpm_trans_init(alpmflags,
AqpmWorker::cb_trans_evt, AqpmWorker::cb_trans_conv,
AqpmWorker::cb_trans_progress) == -1) {
QVariantMap args;
Expand All @@ -731,7 +731,7 @@ void Worker::systemUpgrade(int flags, bool downgrade)

int dwng = downgrade ? 1 : 0;

if (alpm_trans_sysupgrade(dwng) == -1) {
if (alpm_sync_sysupgrade(dwng) == -1) {
qDebug() << "Creating a sysupgrade transaction failed!!";
QVariantMap args;
args["ErrorString"] = QString(alpm_strerrorlast());
Expand Down Expand Up @@ -906,7 +906,7 @@ bool Worker::commitTransaction(alpm_list_t *data)

bool Worker::addTransTarget(const QString &target)
{
int res = alpm_trans_addtarget(qstrdup(target.toUtf8()));
int res = alpm_sync_target(qstrdup(target.toUtf8()));

if (res == -1) {
if (pm_errno == PM_ERR_TRANS_DUP_TARGET) {
Expand Down
10 changes: 5 additions & 5 deletions libaqpm/worker/w_callbacks.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,7 @@ void CallBacks::cb_trans_conv(pmtransconv_t event, void *data1, void *data2,

}

int CallBacks::cb_fetch(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew)
int CallBacks::cb_fetch(const char *url, const char *localpath, int force)
{
Q_D(CallBacks);

Expand Down Expand Up @@ -350,7 +350,7 @@ int CallBacks::cb_fetch(const char *url, const char *localpath, time_t mtimeold,
qDebug() << "The file is " << d->currentFile;

// Let's check if the modification times collide. If so, there's no need to download the file

/*
time_t newtime = mreply.arguments().first().toInt();
qDebug() << "Header says" << newtime;
qDebug() << "Old file says" << mtimeold;
Expand All @@ -364,7 +364,7 @@ int CallBacks::cb_fetch(const char *url, const char *localpath, time_t mtimeold,
}
qDebug() << "Compare successful";

*/
// If we got here, it's time to download the file.

ReturnStringConditionalEventLoop e(url);
Expand Down Expand Up @@ -453,9 +453,9 @@ void cb_dl_total(off_t total)
CallBacks::instance()->cb_dl_total(total);
}

int cb_fetch(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew)
int cb_fetch(const char *url, const char *localpath, int force)
{
return CallBacks::instance()->cb_fetch(url, localpath, mtimeold, mtimenew);
return CallBacks::instance()->cb_fetch(url, localpath, force);
}

void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
Expand Down
4 changes: 2 additions & 2 deletions libaqpm/worker/w_callbacks_p.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class CallBacks : public QObject
int howmany, int remain);
void cb_dl_total(off_t total);
void cb_log(pmloglevel_t level, char *fmt, va_list args);
int cb_fetch(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew);
int cb_fetch(const char *url, const char *localpath, int force);

void setWorker(Worker *worker);

Expand Down Expand Up @@ -85,7 +85,7 @@ void cb_dl_total(off_t total);
void cb_trans_progress(pmtransprog_t event, const char *pkgname, int percent,
int howmany, int remain);
void cb_log(pmloglevel_t level, char *fmt, va_list args);
int cb_fetch(const char *url, const char *localpath, time_t mtimeold, time_t *mtimenew);
int cb_fetch(const char *url, const char *localpath, int force);
int pm_vasprintf(char **string, pmloglevel_t level, const char *format, va_list args);

class ReturnStringConditionalEventLoop : public QEventLoop
Expand Down

0 comments on commit 102a240

Please sign in to comment.