Fix endianness tests, allowing arm64 support

[simgear.git] / simgear / package / Catalog.cxx

diff --git a/simgear/package/Catalog.cxx b/simgear/package/Catalog.cxx
index 6bc23efe5068b7785a9c3853062b8628f6f08d37..9c36d2aabfd7a2ed3b49d2569098de0143ed63d3 100644 (file)
--- a/simgear/package/Catalog.cxx
+++ b/simgear/package/Catalog.cxx
@@ -216,6 +216,23 @@ Catalog::installedPackages() const
   return r;
 }
   
+InstallRef Catalog::installForPackage(PackageRef pkg) const
+{
+    PackageInstallDict::const_iterator it = m_installed.find(pkg);
+    if (it == m_installed.end()) {
+        // check if it exists on disk, create
+
+        SGPath p(pkg->pathOnDisk());
+        if (p.exists()) {
+            return Install::createFromPath(p, CatalogRef(const_cast<Catalog*>(this)));
+        }
+      
+        return NULL;
+    }
+  
+    return it->second;
+}
+  
 void Catalog::refresh()
 {
     Downloader* dl = new Downloader(this, url());
@@ -227,19 +244,47 @@ void Catalog::parseProps(const SGPropertyNode* aProps)
 {
     // copy everything except package children?
     m_props = new SGPropertyNode;
-    
+
+    m_variantDict.clear(); // will rebuild during parse
+    std::set<PackageRef> orphans;
+    orphans.insert(m_packages.begin(), m_packages.end());
+
     int nChildren = aProps->nChildren();
     for (int i = 0; i < nChildren; i++) {
         const SGPropertyNode* pkgProps = aProps->getChild(i);
         if (strcmp(pkgProps->getName(), "package") == 0) {
-            PackageRef p = new Package(pkgProps, this);
-            m_packages.push_back(p);   
+            PackageRef p = getPackageById(pkgProps->getStringValue("id"));
+            if (p) {
+                // existing package
+                p->updateFromProps(pkgProps);
+                orphans.erase(p); // not an orphan
+            } else {
+                // new package
+                p = new Package(pkgProps, this);
+                m_packages.push_back(p);
+            }
+
+            string_list vars(p->variants());
+            for (string_list::iterator it = vars.begin(); it != vars.end(); ++it) {
+                m_variantDict[*it] = p.ptr();
+            }
         } else {
             SGPropertyNode* c = m_props->getChild(pkgProps->getName(), pkgProps->getIndex(), true);
             copyProperties(pkgProps, c);
         }
     } // of children iteration
-  
+
+    if (!orphans.empty()) {
+        SG_LOG(SG_GENERAL, SG_WARN, "have orphan packages: will become inaccesible");
+        std::set<PackageRef>::iterator it;
+        for (it = orphans.begin(); it != orphans.end(); ++it) {
+            SG_LOG(SG_GENERAL, SG_WARN, "\torphan package:" << (*it)->qualifiedId());
+            PackageList::iterator pit = std::find(m_packages.begin(), m_packages.end(), *it);
+            assert(pit != m_packages.end());
+            m_packages.erase(pit);
+        }
+    }
+
     if (!m_url.empty()) {
         if (m_url != m_props->getStringValue("url")) {
             // this effectively allows packages to migrate to new locations,
@@ -263,13 +308,13 @@ void Catalog::parseProps(const SGPropertyNode* aProps)
 
 PackageRef Catalog::getPackageById(const std::string& aId) const
 {
-    BOOST_FOREACH(PackageRef p, m_packages) {
-        if (p->id() == aId) {
-            return p;
-        }
-    }
-    
-    return NULL; // not found
+    // search the variant dict here, so looking up aircraft variants
+    // works as expected.
+    PackageWeakMap::const_iterator it = m_variantDict.find(aId);
+    if (it == m_variantDict.end())
+        return NULL;
+
+    return it->second;
 }
 
 std::string Catalog::id() const
@@ -339,6 +384,23 @@ void Catalog::refreshComplete(Delegate::FailureCode aReason)
     m_root->catalogRefreshComplete(this, aReason);
 }
 
+void Catalog::registerInstall(Install* ins)
+{
+  if (!ins || ins->package()->catalog() != this) {
+    return;
+  }
+  
+  m_installed[ins->package()] = ins;
+}
+
+void Catalog::unregisterInstall(Install* ins)
+{
+  if (!ins || ins->package()->catalog() != this) {
+    return;
+  }
+  
+  m_installed.erase(ins->package());
+}
 
 } // of namespace pkg