← Back to branch summary

~dobey/keeper/cleanup

« back to all changes in this revision

Viewing changes to src/service/backup-choices.cpp

  • Committer: Bileto Bot
  • Author(s): Charles Kerr, Xavi Garcia Mena, Xavi Garcia
  • Date: 2017-02-13 08:57:25 UTC
  • mfrom: (126.1.21 keeper-tests-charles)
  • Revision ID: ci-train-bot@canonical.com-20170213085725-rpsp9eg86dk2zlvi
Adds integration tests for restore and restore cancellation.

Approved by: Charles Kerr, unity-api-1-bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/service/backup-choices.cpp
59
59
}
60
60
 
61
61
void
62
 
BackupChoices::get_backups_async()
 
62
BackupChoices::get_backups_async(QString const & /*storage*/)
63
63
{
64
64
    backups_.clear();
65
65
    //
67
67
    //
68
68
    {
69
69
        Metadata m(generate_new_uuid(), "System Data"); // FIXME: how to i18n in a Qt DBus service?
70
 
        m.set_property(Metadata::TYPE_KEY, Metadata::SYSTEM_DATA_VALUE);
 
70
        m.set_property_value(Metadata::TYPE_KEY, Metadata::SYSTEM_DATA_VALUE);
71
71
        backups_.push_back(m);
72
72
    }
73
73
 
120
120
                    display_name = QStringLiteral("%1 (%2)").arg(display_name).arg(version.toString());
121
121
 
122
122
                Metadata m(generate_new_uuid(), display_name);
123
 
                m.set_property(Metadata::PACKAGE_KEY, name.toString());
124
 
                m.set_property(Metadata::TYPE_KEY, Metadata::APPLICATION_VALUE);
 
123
                m.set_property_value(Metadata::PACKAGE_KEY, name.toString());
 
124
                m.set_property_value(Metadata::TYPE_KEY, Metadata::APPLICATION_VALUE);
125
125
 
126
126
                if (version != QJsonValue::Undefined)
127
 
                    m.set_property(Metadata::VERSION_KEY, version.toString());
 
127
                    m.set_property_value(Metadata::VERSION_KEY, version.toString());
128
128
 
129
129
                backups_.push_back(m);
130
130
            }
154
154
        {
155
155
            const auto keystr = generate_new_uuid();
156
156
            Metadata m(keystr, name);
157
 
            m.set_property(Metadata::TYPE_KEY, Metadata::FOLDER_VALUE);
158
 
            m.set_property(Metadata::SUBTYPE_KEY, locations.front());
 
157
            m.set_property_value(Metadata::TYPE_KEY, Metadata::FOLDER_VALUE);
 
158
            m.set_property_value(Metadata::SUBTYPE_KEY, locations.front());
159
159
            backups_.push_back(m);
160
160
        }
161
161
    }
162
162
 
163
 
    Q_EMIT(finished());
 
163
    Q_EMIT(finished(keeper::Error::OK));
164
164
}