X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Faddon%2Faddon_manager.cpp;h=43e149012fd1c3d503a26a4900e1343639c4c74e;hb=394aff4351bc13e8118482621926e95328fbea71;hp=62e8a7c44c2be9e31dcd5b17d87cdd7fa59f4482;hpb=140e8eab7d0732663de2c1f0a0f2edcc5bc1749f;p=supertux.git

diff --git a/src/addon/addon_manager.cpp b/src/addon/addon_manager.cpp
index 62e8a7c44..43e149012 100644
--- a/src/addon/addon_manager.cpp
+++ b/src/addon/addon_manager.cpp
@@ -48,17 +48,26 @@ MD5 md5_from_file(const std::string& filename)
 
   MD5 md5;
 
-  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)
+    {
+      unsigned char buffer[1024];
+      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)
@@ -80,8 +89,6 @@ AddonManager::AddonManager(const std::string& addon_directory,
   m_installed_addons(),
   m_repository_addons(),
   m_has_been_updated(false),
-  m_install_request(),
-  m_install_status(),
   m_transfer_status()
 {
   PHYSFS_mkdir(m_addon_directory.c_str());
@@ -103,6 +110,15 @@ AddonManager::AddonManager(const std::string& addon_directory,
       }
     }
   }
+
+  try
+  {
+    m_repository_addons = parse_addon_infos("/addons/repository.nfo");
+  }
+  catch(const std::exception& err)
+  {
+    log_warning << "parsing repository.nfo failed: " << err.what() << std::endl;
+  }
 }
 
 AddonManager::~AddonManager()
@@ -194,18 +210,45 @@ AddonManager::has_been_updated() const
   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](bool success)
+      {
+        m_transfer_status = {};
+
+        if (success)
+        {
+          m_repository_addons = parse_addon_infos("/addons/repository.nfo");
+          m_has_been_updated = true;
+        }
+      });
+
+    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");
   }
@@ -232,18 +275,48 @@ AddonManager::request_install_addon(const AddonId& addon_id)
       }
     }
 
-    Addon& repository_addon = get_repository_addon(addon_id);
+    Addon& 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;
+    std::string install_filename = FileSystem::join(m_addon_directory, addon.get_filename());
 
-    m_transfer_status = m_downloader.request_download(repository_addon.get_url(),
-                                                      m_install_request->install_filename);
+    m_transfer_status = m_downloader.request_download(addon.get_url(), install_filename);
 
-    m_install_status = std::make_shared<InstallStatus>();
+    m_transfer_status->then(
+      [this, install_filename, addon_id](bool success)
+      {
+        m_transfer_status = {};
+
+        if (success)
+        {
+          // complete the addon install
+          Addon& repository_addon = get_repository_addon(addon_id);
+
+          MD5 md5 = md5_from_file(install_filename);
+          if (repository_addon.get_md5() != md5.hex_digest())
+          {
+            if (PHYSFS_delete(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(install_filename.c_str());
+            if (!realdir)
+            {
+              throw std::runtime_error("PHYSFS_getRealDir failed: " + install_filename);
+            }
+            else
+            {
+              add_installed_archive(install_filename, md5.hex_digest());
+            }
+          }
+        }
+      });
 
-    return m_install_status;
+    return m_transfer_status;
   }
 }
 
@@ -476,15 +549,14 @@ AddonManager::add_installed_addons()
 }
 
 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)
     {
@@ -524,63 +596,6 @@ void
 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
-AddonManager::abort_install()
-{
-  log_info << "addon install aborted" << std::endl;
-
-  m_downloader.abort(m_transfer_status->id);
-
-  m_install_request = {};
-  m_install_status = {};
-  m_transfer_status = {};
 }
 
 /* EOF */