← Back to branch summary

~charlesk/keeper/lp-1614764-fix-excess-signal-subscriptions

« back to all changes in this revision

Viewing changes to src/storage-framework/storage_framework_client.cpp

  • Committer: Charles Kerr
  • Author(s): Xavi Garcia Mena
  • Date: 2016-08-12 04:20:54 UTC
  • mfrom: (88.1.2 keeper-sf-error-handling)
  • Revision ID: charles.kerr@canonical.com-20160812042054-rcax6j2qvysed185
merge lp:~xavi-garcia-mena/keeper/sf-error-handling-cleanup-checking-state

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/storage-framework/storage_framework_client.cpp
41
41
{
42
42
    QObject::connect(&uploader_ready_watcher_,&QFutureWatcher<std::shared_ptr<Uploader>>::finished, this, &StorageFrameworkClient::uploaderReady);
43
43
    QObject::connect(&uploader_closed_watcher_,&QFutureWatcher<std::shared_ptr<unity::storage::qt::client::File>>::finished, this, &StorageFrameworkClient::onUploaderClosed);
44
 
 
45
44
}
46
45
 
47
46
 
68
67
    catch (std::exception & e)
69
68
    {
70
69
        qDebug() << "ERROR: StorageFrameworkClient::getNewFileForBackup():" << e.what();
71
 
    }
72
 
}
73
 
 
74
 
int StorageFrameworkClient::getUploaderSocketDescriptor()
75
 
{
76
 
    if (!uploader_)
77
 
    {
78
 
        return -1;
79
 
    }
80
 
    auto socket = uploader_->socket();
81
 
    return int(socket->socketDescriptor());
 
70
        throw;
 
71
    }
82
72
}
83
73
 
84
74
void StorageFrameworkClient::finish(bool do_commit)
98
88
    catch (std::exception & e)
99
89
    {
100
90
        qDebug() << "ERROR: StorageFrameworkClient::closeUploader():" << e.what();
 
91
        throw;
101
92
    }
102
93
}
103
94
 
117
108
 
118
109
    Q_EMIT (socketReady(uploader_->socket()));
119
110
}
120
 
 
121
 
bool StorageFrameworkClient::deleteFile(std::shared_ptr<unity::storage::qt::client::File> const &file)
122
 
{
123
 
    try
124
 
    {
125
 
        auto res = file->delete_item();
126
 
        res.waitForFinished();
127
 
    }
128
 
    catch (std::exception & e)
129
 
    {
130
 
        qDebug() << "ERROR: StorageFrameworkClient::deleteFile():" << e.what();
131
 
        return false;
132
 
    }
133
 
    return true;
134
 
}