unsigned char buffer[1024];
PHYSFS_file* file = PHYSFS_openRead(filename.c_str());
- while (true)
+ if (!file)
{
- PHYSFS_sint64 len = PHYSFS_read(file, buffer, 1, sizeof(buffer));
- if (len <= 0) break;
- md5.update(buffer, len);
+ std::ostringstream out;
+ out << "PHYSFS_openRead() failed: " << PHYSFS_getLastError();
+ throw std::runtime_error(out.str());
}
- PHYSFS_close(file);
+ else
+ {
+ while (true)
+ {
+ PHYSFS_sint64 len = PHYSFS_read(file, buffer, 1, sizeof(buffer));
+ if (len <= 0) break;
+ md5.update(buffer, len);
+ }
+ PHYSFS_close(file);
- return md5;
+ return md5;
+ }
}
bool has_suffix(const std::string& str, const std::string& suffix)
m_repository_addons(),
m_has_been_updated(false),
m_install_request(),
- m_install_status(),
m_transfer_status()
{
PHYSFS_mkdir(m_addon_directory.c_str());
return m_has_been_updated;
}
+TransferStatusPtr
+AddonManager::request_check_online()
+{
+ if (m_transfer_status)
+ {
+ throw std::runtime_error("only async request can be made to AddonManager at a time");
+ }
+ else
+ {
+ m_transfer_status = m_downloader.request_download(m_repository_url, "/addons/repository.nfo");
+
+ m_transfer_status->then([this]{
+ m_repository_addons = parse_addon_infos("/addons/repository.nfo");
+ m_has_been_updated = true;
+
+ m_transfer_status = {};
+ });
+
+ return m_transfer_status;
+ }
+}
+
void
AddonManager::check_online()
{
- std::string addoninfos = m_downloader.download(m_repository_url);
- m_repository_addons = parse_addon_infos(addoninfos);
+ m_downloader.download(m_repository_url, "/addons/repository.nfo");
+ m_repository_addons = parse_addon_infos("/addons/repository.nfo");
m_has_been_updated = true;
}
-AddonManager::InstallStatusPtr
+TransferStatusPtr
AddonManager::request_install_addon(const AddonId& addon_id)
{
- if (m_install_status)
+ if (m_transfer_status)
{
throw std::runtime_error("only one addon install request allowed at a time");
}
}
}
- Addon& repository_addon = get_repository_addon(addon_id);
+ {
+ Addon& repository_addon = get_repository_addon(addon_id);
+
+ m_install_request = std::make_shared<InstallRequest>();
+ m_install_request->install_filename = FileSystem::join(m_addon_directory, repository_addon.get_filename());
+ m_install_request->addon_id = addon_id;
+
+ m_transfer_status = m_downloader.request_download(repository_addon.get_url(),
+ m_install_request->install_filename);
+ }
+
+ m_transfer_status->then(
+ [this]
+ {
+ // complete the addon install
+ Addon& repository_addon = get_repository_addon(m_install_request->addon_id);
- m_install_request = std::make_shared<InstallRequest>();
- m_install_request->install_filename = FileSystem::join(m_addon_directory, repository_addon.get_filename());
- m_install_request->addon_id = addon_id;
+ MD5 md5 = md5_from_file(m_install_request->install_filename);
+ if (repository_addon.get_md5() != md5.hex_digest())
+ {
+ if (PHYSFS_delete(m_install_request->install_filename.c_str()) == 0)
+ {
+ log_warning << "PHYSFS_delete failed: " << PHYSFS_getLastError() << std::endl;
+ }
- m_transfer_status = m_downloader.request_download(repository_addon.get_url(),
- m_install_request->install_filename);
+ throw std::runtime_error("Downloading Add-on failed: MD5 checksums differ");
+ }
+ else
+ {
+ const char* realdir = PHYSFS_getRealDir(m_install_request->install_filename.c_str());
+ if (!realdir)
+ {
+ throw std::runtime_error("PHYSFS_getRealDir failed: " + m_install_request->install_filename);
+ }
+ else
+ {
+ add_installed_archive(m_install_request->install_filename, md5.hex_digest());
+ }
+ }
- m_install_status = std::make_shared<InstallStatus>();
+ m_install_request = {};
+ m_transfer_status = {};
+ });
- return m_install_status;
+ return m_transfer_status;
}
}
}
AddonManager::AddonList
-AddonManager::parse_addon_infos(const std::string& addoninfos) const
+AddonManager::parse_addon_infos(const std::string& filename) const
{
AddonList m_addons;
try
{
lisp::Parser parser;
- std::stringstream addoninfos_stream(addoninfos);
- const lisp::Lisp* root = parser.parse(addoninfos_stream, "supertux-addons");
+ const lisp::Lisp* root = parser.parse(filename);
const lisp::Lisp* addons_lisp = root->get_lisp("supertux-addons");
if(!addons_lisp)
{
AddonManager::update()
{
m_downloader.update();
-
- if (m_install_status)
- {
- m_install_status->now = m_transfer_status->dlnow;
- m_install_status->total = m_transfer_status->dltotal;
-
- if (m_transfer_status->status != TransferStatus::RUNNING)
- {
- if (m_transfer_status->status != TransferStatus::COMPLETED)
- {
- log_warning << "Some error" << std::endl;
- }
- else
- {
- Addon& repository_addon = get_repository_addon(m_install_request->addon_id);
-
- MD5 md5 = md5_from_file(m_install_request->install_filename);
- if (repository_addon.get_md5() != md5.hex_digest())
- {
- if (PHYSFS_delete(m_install_request->install_filename.c_str()) == 0)
- {
- log_warning << "PHYSFS_delete failed: " << PHYSFS_getLastError() << std::endl;
- }
-
- throw std::runtime_error("Downloading Add-on failed: MD5 checksums differ");
- }
- else
- {
- const char* realdir = PHYSFS_getRealDir(m_install_request->install_filename.c_str());
- if (!realdir)
- {
- throw std::runtime_error("PHYSFS_getRealDir failed: " + m_install_request->install_filename);
- }
- else
- {
- add_installed_archive(m_install_request->install_filename, md5.hex_digest());
- }
- }
- }
-
- m_install_request = {};
- m_install_status = {};
- m_transfer_status = {};
- }
- }
}
void
m_downloader.abort(m_transfer_status->id);
m_install_request = {};
- m_install_status = {};
m_transfer_status = {};
}