* Add webodfversion.js.in (thanks Friedrich!)

to track the webodf version in js. * OdfContainer gets updateMetadataForSaving, which is called just before saving and updates dc:generator.
wabson · Nov 25, 2013 · 6826fe2 · 6826fe2
1 parent b53d615
commit 6826fe2
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/webodf/CMakeLists.txt b/webodf/CMakeLists.txt
@@ -4,6 +4,8 @@ if(WRONGCMAKEDIR)
   message(FATAL_ERROR "You should point CMake to the parent directory.")
 endif(WRONGCMAKEDIR)
 
+configure_file(webodfversion.js.in ${CMAKE_CURRENT_BINARY_DIR}/webodfversion.js)
+
 set(TESTJSFILES tests/core/ZipTests.js
     tests/core/Base64Tests.js
     tests/core/DomUtilsTests.js
@@ -36,6 +38,7 @@ add_custom_target(jslintcheck ALL
     COMMAND ${NODE} lib/runtime.js tools/runjslint.js
         ${LIBJSFILES} ${TESTJSFILES}
         ${CMAKE_CURRENT_BINARY_DIR}/webodf.css.js
+        ${CMAKE_CURRENT_BINARY_DIR}/webodfversion.js
     DEPENDS NodeJS webodf.css.js
     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
     SOURCES ${LIBJSFILES} ${TESTJSFILES}
@@ -71,7 +74,8 @@ if (Java_JAVA_EXECUTABLE)
   endforeach(JSFILE ${TESTJSFILES})
 
   set(LIB_CLOSURE_ARGS ${LIB_CLOSURE_ARGS}
-      --js ${CMAKE_CURRENT_BINARY_DIR}/webodf.css.js)
+      --js ${CMAKE_CURRENT_BINARY_DIR}/webodf.css.js
+      --js ${CMAKE_CURRENT_BINARY_DIR}/webodfversion.js)
 
   add_custom_command(
       OUTPUT simplecompiled.js

diff --git a/webodf/lib/odf/OdfContainer.js b/webodf/lib/odf/OdfContainer.js
@@ -36,7 +36,7 @@
  * @source: https://github.com/kogmbh/WebODF/
  */
 
-/*global Node, NodeFilter, runtime, core, xmldom, odf, DOMParser, document*/
+/*global Node, NodeFilter, runtime, core, xmldom, odf, DOMParser, document, webodf_version */
 
 runtime.loadClass("core.Base64");
 runtime.loadClass("core.Zip");
@@ -904,6 +904,32 @@ odf.OdfContainer = (function () {
             zip.load(url, callback);
         };
 
+        /**
+         * Write pre-saving metadata to the DOM
+         * @return {undefined}
+         */
+        function updateMetadataForSaving() {
+            // set the opendocument provider used to create/
+            // last modify the document.
+            // this string should match the definition for
+            // user-agents in the http protocol as specified
+            // in section 14.43 of [RFC2616].
+            var generatorString,
+                window = runtime.getWindow();
+
+            generatorString = "WebODF/" + (
+                String(typeof webodf_version) !== "undefined"
+                    ? webodf_version
+                    : "FromSource"
+            );
+
+            if (window) {
+                generatorString = generatorString + " " + window.navigator.userAgent;
+            }
+
+            metadataManager.setMetadata({"meta:generator": generatorString});
+        }
+
         /**
          * @return {!core.Zip}
          */
@@ -941,6 +967,8 @@ odf.OdfContainer = (function () {
             addToplevelElement("body");
             root.body.appendChild(text);
 
+            initializeMetadataManager(root.meta);
+
             setState(OdfContainer.DONE);
             return emptyzip;
         }
@@ -955,6 +983,9 @@ odf.OdfContainer = (function () {
             // update the zip entries with the data from the live ODF DOM
             var data,
                 date = new Date();
+
+            updateMetadataForSaving();
+
             data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
             zip.save("settings.xml", data, true, date);
             data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");

diff --git a/webodf/webodfversion.js.in b/webodf/webodfversion.js.in
@@ -0,0 +1 @@
+var /**@const{!string}*/webodf_version = "@WEBODF_VERSION@";