Merge pull request compiler-explorer#1055 from mattgodbolt/ogtest

og: tags

Author: mattgodbolt

app.js

@@ -335,16 +335,29 @@ aws.initConfig(awsProps)
                     const id = req.params.id;
                     storageHandler.expandId(id)
                         .then(result => {
+                            const config = JSON.parse(result.config);
                             const metadata = {
-                                ogDescription: result.metadata ? result.metadata.description.S : null,
-                                ogAuthor: result.metadata ? result.metadata.author.S : null,
-                                ogTitle: result.metadata ? result.metadata.title.S : null
+                                ogDescription: result.specialMetadata ? result.specialMetadata.description.S : null,
+                                ogAuthor: result.specialMetadata ? result.specialMetadata.author.S : null,
+                                ogTitle: result.specialMetadata ? result.specialMetadata.title.S : "Compiler Explorer"
                             };
+                            if (!metadata.ogDescription) {
+                                const sources = utils.glGetEditorSources(config.content);
+                                if (sources.length === 1) {
+                                    const lang = languages[sources[0].language];
+                                    metadata.ogDescription = sources[0].source;
+                                    if (lang) {
+                                        metadata.ogTitle += ` - ${lang.name}`;
+                                    }
+                                }
+                            } else if (metadata.ogAuthor && metadata.ogAuthor !== '.') {
+                                metadata.ogDescription += `\nAuthor(s): ${metadata.ogAuthor}`;
+                            }
                             staticHeaders(res);
                             contentPolicyHeader(res);
                             res.render('index', renderConfig({
                                 embedded: false,
-                                config: JSON.parse(result.config),
+                                config: config,
                                 metadata: metadata
                             }));
                         })

lib/storage/storage-s3.js

@@ -81,7 +81,6 @@ class StorageS3 extends StorageBase {
                     creation_date: {
                         S: now.toISOString()
                     }
-
                 }
             }).promise(),
             this.s3.put(item.fullHash, item.config, this.prefix, {})
@@ -157,15 +156,14 @@ class StorageS3 extends StorageBase {
         }).promise()
             .then(item => {
                 const full_hash = item.Attributes.full_hash.S;
-                const attribute_metadata = item.Attributes.named_metadata;
-                const metadata = attribute_metadata ? attribute_metadata.M : null;
+                const special_metadata = item.Attributes.named_metadata ? item.Attributes.named_metadata.M : null;
                 return this.s3.get(full_hash, this.prefix)
                     .then(result => {
                         // If we're here, we are pretty confident there is a match. But never hurts to double check
                         if (result.hit) {
                             return {
                                 config: result.data.toString(),
-                                metadata: metadata
+                                specialMetadata: special_metadata
                             };
                         } else {
                             throw new Error(`ID ${id} not present in storage`);

lib/utils.js

@@ -123,3 +123,23 @@ exports.getHash = function getHash(object, HashVersion = 'Compiler Explorer Defa
         .update(asString)
         .digest('hex');
 };
+
+/***
+ * Gets every pair of source, lang available
+ * @param content {Array}
+ * @returns {Array}
+ */
+exports.glGetEditorSources = function glGetEditorSources(content) {
+    let sources = [];
+    _.each(content, element => {
+        if (element.type === 'component') {
+            if (element.componentName === 'codeEditor') {
+                sources.push({source: element.componentState.source, language: element.componentState.lang});
+            }
+        } else {
+            sources = glGetEditorSources(element.content).concat(sources);
+        }
+    });
+    return sources;
+
+};

test/storage/storage-s3-tests.js

@@ -162,7 +162,7 @@ describe('Stores to s3', () => {
             prefix: "ABCDEF",
             uniqueSubHash: "ABCDEFG",
             fullHash: "ABCDEFGHIJKLMNOP",
-            config: "yo"
+            config: 'yo'
         };
 
         const ran = {s3: false, dynamo: false};

views/head.pug

@@ -1,25 +1,20 @@
 link(rel="icon" href="favicon.ico?v=1")
 meta(charset="utf-8")
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
-
-if metadata && metadata.ogDescription
-  meta(name="description" content=metadata.ogDescription)
-  if metadata.ogAuthor && metadata.ogAuthor !== '.'
-    meta(property="og:description" content=metadata.ogDescription + ". Author(s): " + metadata.ogAuthor)
-  else
-    meta(property="og:description" content=metadata.ogDescription)
-else
-  meta(name="description" content="Compiler Explorer is an interactive online compiler which shows the assembly output of compiled C, C++, Rust, Go, D, Haskell, Swift & Pascal code.")
-
-if metadata && metadata.ogTitle
+title Compiler Explorer
+if metadata
   meta(property="og:title" content=metadata.ogTitle)
-  title Compiler Explorer - #{metadata.ogTitle}
+  if metadata.ogDescription
+    meta(name="description" content=metadata.ogDescription)
+    meta(property="og:description" content=metadata.ogDescription)
+  else
+    meta(name="description" content="Compiler Explorer is an interactive online compiler which shows the assembly output of compiled C, C++, Rust, Go, D, Haskell, Swift, Pascal & CUDA code.")
+    meta(property="og:description" content="Compiler Explorer is an interactive online compiler which shows the assembly output of compiled C, C++, Rust, Go, D, Haskell, Swift, Pascal & CUDA code.")
 else
-  title Compiler Explorer
-
+  meta(name="description" content="Compiler Explorer is an interactive online compiler which shows the assembly output of compiled C, C++, Rust, Go, D, Haskell, Swift, Pascal & CUDA code.")
+  meta(property="og:title" content="Compiler Explorer")
 meta(name="twitter:card" content="summary")
 meta(name="twitter:site" content="@mattgodbolt")
-meta(property="og:site_name" content="Compiler Explorer")
 meta(property="og:image" content=require("ce-icon.png"))
 meta(property="og:image:secure_url" content=require("ce-icon.png"))
 meta(property="og:image:type" content="image/png")