mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 10:40:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

More restructuring

Browse Source
This commit is contained in:
Alexander Bock
2015-06-15 00:37:48 +02:00
parent 0459f0472b
commit 0a02906d8e
5 changed files with 85 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
apps/Launcher/infowidget.cpp
View File

@@ -36,6 +36,8 @@ InfoWidget::InfoWidget(QString name, int totalBytes)
, _messages(nullptr)
, _totalBytes(totalBytes)
{
setFixedHeight(100);
QGridLayout* layout = new QGridLayout;
_name = new QLabel(name);
@@ -68,7 +70,7 @@ void InfoWidget::update(int currentBytes) {
void InfoWidget::update(float progress) {
_bytes->setText("");
_progress->setValue(progress);
_progress->setValue(static_cast<int>(progress * 100));
}
void InfoWidget::error(QString message) {

104
apps/Launcher/syncwidget.cpp
View File

@@ -34,6 +34,7 @@
#include <ghoul/misc/dictionary.h>
#include <ghoul/lua/ghoul_lua.h>
#include <QApplication>
#include <QCheckBox>
#include <QDebug>
#include <QDir>
@@ -95,7 +96,7 @@ SyncWidget::SyncWidget(QWidget* parent, Qt::WindowFlags f)
{
QWidget* downloadBox = new QGroupBox;
downloadBox->setFixedSize(500, 500);
downloadBox->setMinimumSize(450, 1000);
_downloadLayout = new QVBoxLayout;
downloadBox->setLayout(_downloadLayout);
@@ -157,80 +158,76 @@ void SyncWidget::clear() {
}
void SyncWidget::handleDirectFiles(QString module, DirectFiles files) {
void SyncWidget::handleDirectFiles() {
qDebug() << "Direct Files";
for (const DirectFile& f : files) {
for (const DirectFile& f : _directFiles) {
InfoWidget* w = new InfoWidget(f.destination);
_downloadLayout->addWidget(w);
//_stringInfoWidgetMap[f.destination] = w;
qDebug() << f.url << " -> " << f.destination;
auto finishedCallback =
[w](const ghoul::filesystem::File& f) {
qDebug() << QString::fromStdString(f.filename()) << "finished";
//delete w;
delete w;
qApp->processEvents();
};
auto progressCallback =
[w](const ghoul::filesystem::File& f, float progress) {
qDebug() << QString::fromStdString(f.filename()) << ": " << progress;
w->update(progress);
qApp->processEvents();
};
std::string url = f.url.toStdString();
std::string path = fullPath(module, f.destination).toStdString();
_threads.push_back(
std::thread([url, path, finishedCallback, progressCallback](){
DlManager.downloadFile(
url,
path,
finishedCallback,
progressCallback
);
})
DlManager.downloadFile(
f.url.toStdString(),
fullPath(f.module, f.destination).toStdString(),
finishedCallback,
progressCallback
);
}
}
void SyncWidget::handleFileRequest(QString module, FileRequests files) {
void SyncWidget::handleFileRequest() {
qDebug() << "File Requests";
for (const FileRequest& f : files) {
for (const FileRequest& f : _fileRequests) {
InfoWidget* w = new InfoWidget(f.identifier, -1);
_downloadLayout->addWidget(w);
//_stringInfoWidgetMap[f.identifier] = w;
auto finishedCallback =
[w](const ghoul::filesystem::File& f) {
qDebug() << QString::fromStdString(f.filename()) << "finished";
delete w;
qApp->processEvents();
};
auto progressCallback =
[w](const ghoul::filesystem::File& f, float progress) {
qDebug() << QString::fromStdString(f.filename()) << ": " << progress;
w->update(progress);
qApp->processEvents();
};
qDebug() << f.identifier << " (" << f.version << ")" << " -> " << f.destination;
std::string identifier = f.identifier.toStdString();
std::string path = fullPath(module, f.destination).toStdString();
std::string path = fullPath(f.module, f.destination).toStdString();
int version = f.version;
_threads.push_back(
std::thread([identifier, path, version, progressCallback](){
DlManager.downloadRequestFiles(
identifier,
path,
version,
[](const ghoul::filesystem::File& f) { qDebug() << "finished"; },
progressCallback
);
})
DlManager.downloadRequestFiles(
identifier,
path,
version,
finishedCallback,
progressCallback
);
}
}
void SyncWidget::handleTorrentFiles(QString module, TorrentFiles files) {
void SyncWidget::handleTorrentFiles() {
qDebug() << "Torrent Files";
for (const TorrentFile& f : files) {
QString file = QString::fromStdString(absPath(fullPath(module, f.file).toStdString()));
for (const TorrentFile& f : _torrentFiles) {
QString file = QString::fromStdString(absPath(fullPath(f.module, f.file).toStdString()));
qDebug() << file;
if (!QFileInfo(file).exists()) {
@@ -240,7 +237,7 @@ void SyncWidget::handleTorrentFiles(QString module, TorrentFiles files) {
libtorrent::error_code ec;
libtorrent::add_torrent_params p;
p.save_path = absPath(fullPath(module, ".").toStdString());
p.save_path = absPath(fullPath(f.module, ".").toStdString());
qDebug() << QString::fromStdString(p.save_path);
p.ti = new libtorrent::torrent_info(file.toStdString(), ec);
p.name = f.file.toStdString();
@@ -303,7 +300,6 @@ void SyncWidget::syncButtonPressed() {
bool found = dataDictionary.getValue<ghoul::Dictionary>(FileDownloadKey, directDownloadFiles);
if (found) {
DirectFiles files;
for (int i = 1; i <= directDownloadFiles.size(); ++i) {
if (!directDownloadFiles.hasKeyAndValue<ghoul::Dictionary>(std::to_string(i))) {
qDebug() << QString::fromStdString(FileDownloadKey) << " is not a dictionary";
@@ -319,17 +315,16 @@ void SyncWidget::syncButtonPressed() {
}
std::string dest = d.value<std::string>(DestinationKey);
files.append({
_directFiles.append({
module,
QString::fromStdString(url),
QString::fromStdString(dest)
});
}
handleDirectFiles(module, files);
}
found = dataDictionary.getValue<ghoul::Dictionary>(FileRequestKey, fileRequests);
if (found) {
FileRequests files;
for (int i = 1; i <= fileRequests.size(); ++i) {
ghoul::Dictionary d = fileRequests.value<ghoul::Dictionary>(std::to_string(i));
std::string url = d.value<std::string>(IdentifierKey);
@@ -337,28 +332,47 @@ void SyncWidget::syncButtonPressed() {
int version = static_cast<int>(d.value<double>(VersionKey));
files.append({
_fileRequests.append({
module,
QString::fromStdString(url),
QString::fromStdString(dest),
version
});
}
handleFileRequest(module, files);
}
found = dataDictionary.getValue<ghoul::Dictionary>(TorrentFilesKey, torrentFiles);
if (found) {
TorrentFiles torrents;
for (int i = 1; i <= torrentFiles.size(); ++i) {
std::string f = torrentFiles.value<std::string>(std::to_string(i));
torrents.append({QString::fromStdString(f)});
_torrentFiles.append({
module,
QString::fromStdString(f)
});
}
handleTorrentFiles(module, torrents);
}
}
}
}
//// Make the lists unique
//{
// QSet<DirectFile> s = _directFiles.toSet();
// _directFiles = QList<DirectFile>::fromSet(s);
//}
//{
// QSet<FileRequest> s = _fileRequests.toSet();
// _fileRequests = QList<FileRequest>::fromSet(s);
//}
//{
// QSet<TorrentFile> s = _torrentFiles.toSet();
// _torrentFiles = QList<TorrentFile>::fromSet(s);
//}
handleDirectFiles();
handleFileRequest();
handleTorrentFiles();
}
QStringList SyncWidget::selectedScenes() const {

19
apps/Launcher/syncwidget.h
View File

@@ -31,7 +31,7 @@
#include <libtorrent/torrent_handle.hpp>
#include <thread>
//#include <thread>
class QBoxLayout;
class QGridLayout;
@@ -58,31 +58,31 @@ private slots:
private:
struct DirectFile {
QString module;
QString url;
QString destination;
};
typedef QList<DirectFile> DirectFiles;
struct FileRequest {
QString module;
QString identifier;
QString destination;
int version;
};
typedef QList<FileRequest> FileRequests;
struct TorrentFile {
QString module;
QString file;
};
typedef QList<TorrentFile> TorrentFiles;
void clear();
QStringList selectedScenes() const;
QString fullPath(QString module, QString destination) const;
void handleDirectFiles(QString module, DirectFiles files);
void handleFileRequest(QString module, FileRequests files);
void handleTorrentFiles(QString module, TorrentFiles files);
void handleDirectFiles();
void handleFileRequest();
void handleTorrentFiles();
QMap<QString, QString> _sceneFiles;
QString _modulesDirectory;
@@ -91,9 +91,10 @@ private:
libtorrent::session* _session;
QMap<libtorrent::torrent_handle, InfoWidget*> _torrentInfoWidgetMap;
//QMap<QString, InfoWidget*> _stringInfoWidgetMap;
std::vector<std::thread> _threads;
QList<DirectFile> _directFiles;
QList<FileRequest> _fileRequests;
QList<TorrentFile> _torrentFiles;
};
#endif // __SYNCWIDGET_H__

4
include/openspace/engine/downloadmanager.h
View File

@@ -42,6 +42,10 @@ public:
void (const ghoul::filesystem::File&)
> DownloadFinishedCallback;
//struct FileFuture {
//};
DownloadManager(std::string requestURL, int applicationVersion);
bool downloadFile(

17
src/engine/downloadmanager.cpp
View File

@@ -28,7 +28,7 @@
#include <ghoul/logging/logmanager.h>
#include <fstream>
#include <thread>
//#include <thread>
#ifdef OPENSPACE_CURL_ENABLED
#include <curl/curl.h>
@@ -161,12 +161,12 @@ bool DownloadManager::downloadRequestFiles(
std::string requestFile = absPath("${TEMPORARY}/" + identifier);
LDEBUG("Request File: " << requestFile);
std::vector<std::thread> threads;
//std::vector<std::thread> threads;
bool success = downloadFile(
fullRequest,
requestFile,
[destination, &progressCallback, &threads](const ghoul::filesystem::File& f) {
[destination, &progressCallback](const ghoul::filesystem::File& f) {
LDEBUG("Finished: " << f.path());
std::ifstream temporary(f.path());
std::string line;
@@ -177,21 +177,22 @@ bool DownloadManager::downloadRequestFiles(
std::string file = ghoul::filesystem::File(line).filename();
LDEBUG("\tLine: " << line << " ; Dest: " << destination.path() + "/" + file);
threads.push_back(
std::thread([&nFinished, line, destination, file, progressCallback](){
//threads.push_back(
//std::thread([&nFinished, line, destination, file, progressCallback](){
DlManager.downloadFile(
line,
destination.path() + "/" + file,
[&nFinished](const ghoul::filesystem::File& f) { ++nFinished; },
[&progressCallback](const ghoul::filesystem::File& f, float progress) { progressCallback(f, progress); }
);})
//);}
//)
);
}
}
);
for (std::thread& t : threads)
t.join();
//for (std::thread& t : threads)
//t.join();