From 2f2f136685fe2a13dcaf099e1413cbb5b9dc1116 Mon Sep 17 00:00:00 2001
From: Micah Acinapura <micahnyc@gmail.com>
Date: Tue, 12 May 2020 16:55:35 -0400
Subject: [PATCH] fix template and writer for scene license info

---
 data/web/documentation/scenelicense.hbs | 14 ++++++--------
 src/scene/scenelicensewriter.cpp        | 16 ++++++++++++++--
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/data/web/documentation/scenelicense.hbs b/data/web/documentation/scenelicense.hbs
index 0399a74564..ee9bce0479 100644
--- a/data/web/documentation/scenelicense.hbs
+++ b/data/web/documentation/scenelicense.hbs
@@ -3,14 +3,12 @@
   <div class="row">
     <div class="col-lg-12">
       <p>
-         <a href="#{{urlify module}}" name="{{urlify module}}">
-          <span class="documentation-key">{{module}}</span>
-        </a>
-        <p>{{name}}</p>
-        <br />
-        <p>{{attribution}}</p>
-        <p>{{url}}</p>
-        <p>{{licenseText}}</p>
+        <h3>Asset - {{name}}</h3>
+        <p>{{description}}</p>
+        <p>Version - {{version}}</p>
+        <p>Author - {{author}}</p>
+        <p>Associated URL - <a href="{{url}}">{{url}}</a></p>
+        <p>Filepath - {{path}}</p>
       </p>
     </div>
   </div>
diff --git a/src/scene/scenelicensewriter.cpp b/src/scene/scenelicensewriter.cpp
index b954008889..bd2e2ff8ec 100644
--- a/src/scene/scenelicensewriter.cpp
+++ b/src/scene/scenelicensewriter.cpp
@@ -51,6 +51,16 @@ std::string SceneLicenseWriter::generateJson() const {
     std::vector<const Asset*> assets =
         global::openSpaceEngine.assetManager().rootAsset().subTreeAssets();
 
+    int metaTotal = 0;
+    for (const Asset* asset : assets) {
+        std::optional<Asset::MetaInformation> meta = asset->metaInformation();
+        if (!meta.has_value()) {
+            continue;
+        }
+        metaTotal++;
+    }
+
+    int metaCount = 0;
     for (const Asset* asset : assets) {
         std::optional<Asset::MetaInformation> meta = asset->metaInformation();
         
@@ -69,10 +79,12 @@ std::string SceneLicenseWriter::generateJson() const {
         json << fmt::format(replStr, "author", escapedJson(meta->author));
         json << fmt::format(replStr, "url", escapedJson(meta->url));
         //json << fmt::format(replStr2, "licenseText", escapedJson(license.licenseText));
-        json << fmt::format(replStr2, "license", escapedJson(meta->license));
+        json << fmt::format(replStr, "license", escapedJson(meta->license));
+        json << fmt::format(replStr2, "path", escapedJson(asset->assetFilePath()));
         json << "}";
 
-        if (&asset != &(assets.back())) {
+        metaCount++;
+        if (metaCount != metaTotal) {
             json << ",";
         }
     }