← Back to branch summary

~xavi-garcia-mena/keeper/sf-errors-dbus-interface

« back to all changes in this revision

Viewing changes to src/helper/backup-helper.cpp

  • Committer: Xavi Garcia Mena
  • Date: 2016-09-13 08:47:14 UTC
  • mfrom: (103.1.1 keeper-error-failures)
  • Revision ID: xavi.garcia.mena@canonical.com-20160913084714-penzekiboyj4q41l
merge lp:~xavi-garcia-mena/keeper/helper-finished-state-removed-and-restore-choices-commented

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/helper/backup-helper.cpp
99
99
        ));
100
100
 
101
101
        // TODO xavi is going to remove this line
102
 
        q_ptr->set_state(Helper::State::STARTED);
 
102
        q_ptr->Helper::on_helper_started();
103
103
 
104
104
        reset_inactivity_timer();
105
105
    }
126
126
    {
127
127
        switch (state)
128
128
        {
129
 
            case Helper::State::HELPER_FINISHED:
130
 
                qDebug() << "helper finished";
131
 
                check_for_done();
132
 
                stop_inactivity_timer();
133
 
                break;
134
 
 
135
129
            case Helper::State::CANCELLED:
136
130
            case Helper::State::FAILED:
137
131
                qDebug() << "cancelled/failed, calling uploader_.reset()";
162
156
        }
163
157
    }
164
158
 
 
159
    void on_helper_finished()
 
160
    {
 
161
        stop_inactivity_timer();
 
162
        check_for_done();
 
163
    }
 
164
 
165
165
private:
166
166
 
167
167
    void on_inactivity_detected()
249
249
        }
250
250
        else if (read_error_ || write_error_ || n_uploaded_ > q_ptr->expected_size())
251
251
        {
252
 
            q_ptr->set_state(Helper::State::FAILED);
 
252
            if (!q_ptr->is_helper_running())
 
253
            {
 
254
                q_ptr->set_state(Helper::State::FAILED);
 
255
            }
253
256
        }
254
257
        else if (n_uploaded_ == q_ptr->expected_size())
255
258
        {
256
259
            if (uploader_)
257
260
            {
258
 
                if (q_ptr->state() == Helper::State::HELPER_FINISHED)
 
261
                if (!q_ptr->is_helper_running())
259
262
                {
260
263
                    // only in the case that the helper process finished we move to the next state
261
264
                    // this is to prevent to start the next task too early
349
352
{
350
353
    Q_D(BackupHelper);
351
354
 
352
 
    Helper::set_state(state);
353
355
    qDebug() << Q_FUNC_INFO;
354
356
    d->on_state_changed(state);
 
357
    Helper::set_state(state);
 
358
}
 
359
 
 
360
void BackupHelper::on_helper_finished()
 
361
{
 
362
    Q_D(BackupHelper);
 
363
    Helper::on_helper_finished();
 
364
    d->on_helper_finished();
355
365
}