Extract catalog loaders to their own files

Author: 375gnu

src/celestia/CMakeLists.txt

@@ -1,4 +1,5 @@
 set(CELESTIA_SOURCES
+  catalogloader.h
   celestiacore.cpp
   celestiacore.h
   celestiastate.cpp
@@ -15,6 +16,12 @@ set(CELESTIA_SOURCES
   helper.h
   hud.cpp
   hud.h
+  loaddso.cpp
+  loaddso.h
+  loadsso.cpp
+  loadsso.h
+  loadstars.cpp
+  loadstars.h
   moviecapture.h
   scriptmenu.cpp
   scriptmenu.h

src/celestia/catalogloader.h

@@ -0,0 +1,105 @@
+// catalogloader.h
+//
+// Copyright (C) 2001-2023, the Celestia Development Team
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+
+#pragma once
+
+#include <algorithm>
+#include <fstream>
+#include <string>
+
+#include <celestia/progressnotifier.h>
+#include <celutil/array_view.h>
+#include <celutil/filetype.h>
+#include <celutil/fsutils.h>
+#include <celutil/gettext.h>
+#include <celutil/logger.h>
+
+namespace celestia
+{
+
+template<class OBJDB> class CatalogLoader
+{
+    OBJDB                     *m_objDB;
+    std::string                m_typeDesc;
+    ContentType                m_contentType;
+    ProgressNotifier          *m_notifier;
+    util::array_view<fs::path> m_skipPaths;
+
+public:
+    CatalogLoader(OBJDB                     *db,
+                  const std::string         &typeDesc,
+                  const ContentType         &contentType,
+                  ProgressNotifier          *notifier,
+                  util::array_view<fs::path> skipPaths) :
+        m_objDB(db),
+        m_typeDesc(typeDesc),
+        m_contentType(contentType),
+        m_notifier(notifier),
+        m_skipPaths(skipPaths)
+    {
+    }
+
+    bool load(std::istream &in, const fs::path &dir)
+    {
+        return m_objDB->load(in, dir);
+    }
+
+    void process(const fs::path &filePath, const fs::path &parentPath)
+    {
+        if (DetermineFileType(filePath) != m_contentType)
+            return;
+
+        if (std::find(std::begin(m_skipPaths), std::end(m_skipPaths), filePath)
+            != std::end(m_skipPaths))
+        {
+            util::GetLogger()->info(_("Skipping {} catalog: {}\n"), m_typeDesc, filePath);
+            return;
+        }
+        util::GetLogger()->info(_("Loading {} catalog: {}\n"), m_typeDesc, filePath);
+        if (m_notifier != nullptr)
+            m_notifier->update(filePath.filename().string());
+
+        if (std::ifstream catalogFile(filePath);
+            !catalogFile.good() || !load(catalogFile, parentPath))
+        {
+            util::GetLogger()->error(_("Error reading {} catalog file: {}\n"),
+                                     m_typeDesc,
+                                     filePath);
+        }
+    }
+
+    void loadExtras(util::array_view<fs::path> dirs)
+    {
+        std::vector<fs::path> entries;
+        std::error_code       ec;
+        for (const auto &dir : dirs)
+        {
+            if (!util::IsValidDirectory(dir))
+                continue;
+
+            entries.clear();
+
+            for (auto iter = fs::recursive_directory_iterator(dir, ec); iter != end(iter);
+                 iter.increment(ec))
+            {
+                if (ec)
+                    continue;
+                if (!fs::is_directory(iter->path(), ec))
+                    entries.push_back(iter->path());
+            }
+
+            std::sort(std::begin(entries), std::end(entries));
+
+            for (const auto &fn : entries)
+                process(fn, fn.parent_path());
+        }
+    }
+};
+
+} // namespace celestia