Fix local storage & add compiler name to unfurling

Author: AbrilRBS

.gitignore

@@ -16,3 +16,4 @@ etc/config/*.local.properties
 *.map
 static/dist
 static/vs
+lib/storage/data

app.js

@@ -342,12 +342,28 @@ aws.initConfig(awsProps)
                                 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;
+                                const sources = utils.glGetMainContents(config.content);
+                                if (sources.editors.length === 1) {
+                                    const editor = sources.editors[0];
+                                    const lang = languages[editor.language];
                                     if (lang) {
+                                        let code = editor.source;
+                                        if (lang.previewFilter) {
+                                            code = _.filter(code.split('\n'), line => {
+                                                return !line.match(lang.previewFilter);
+                                            }).join('\n');
+                                        }
+                                        metadata.ogDescription = code;
                                         metadata.ogTitle += ` - ${lang.name}`;
+                                        if (sources.compilers.length === 1) {
+                                            const compilerId = sources.compilers[0].compiler;
+                                            const compiler = apiHandler.compilers.find(c => c.id === compilerId);
+                                            if (compiler) {
+                                                metadata.ogTitle += ` (${compiler.name})`;
+                                            }
+                                        }
+                                    } else {
+                                        metadata.ogDescription = editor.source;
                                     }
                                 }
                             } else if (metadata.ogAuthor && metadata.ogAuthor !== '.') {
@@ -361,7 +377,8 @@ aws.initConfig(awsProps)
                                 metadata: metadata
                             }));
                         })
-                        .catch(() => {
+                        .catch(err => {
+                            logger.warn(`Exception thrown when expanding ${id}: `, err);
                             next({
                                 statusCode: 404,
                                 message: `ID "${id}" could not be found`

lib/languages.js

@@ -48,7 +48,8 @@ const languages = {
         name: 'C++',
         monaco: 'cppp',
         extensions: ['.cpp', '.cxx', '.h', '.hpp', '.hxx', '.c'],
-        alias: ['gcc', 'cpp']
+        alias: ['gcc', 'cpp'],
+        previewFilter: /^\s*#include/
     },
     llvm: {
         name: 'LLVM IR',
@@ -60,13 +61,15 @@ const languages = {
         name: 'Cppx',
         monaco: 'cppp',
         extensions: ['.cpp', '.cxx', '.h', '.hpp', '.hxx', '.c'],
-        alias: []
+        alias: [],
+        previewFilter: /^\s*#include/
     },
     c: {
         name: 'C',
         monaco: 'c',
         extensions: ['.c', '.h'],
-        alias: []
+        alias: [],
+        previewFilter: /^\s*#include/
     },
     rust: {
         name: 'Rust',

lib/storage/storage-local.js

@@ -42,7 +42,9 @@ class StorageLocal extends StorageBase {
 
     storeItem(item) {
         const filePath = path.join(this.storageFolder, item.uniqueSubHash);
-        return fs.writeJson(filePath, item, {encoding: 'utf8'});
+        return fs.writeJson(filePath, item, {encoding: 'utf8'})
+            .then(() => item)
+            .catch(logger.error);
     }
 
     findUniqueSubhash(hash) {
@@ -95,7 +97,16 @@ class StorageLocal extends StorageBase {
         const expectedPath = path.join(this.storageFolder, id);
         logger.info(`Expanding local id ${id} to ${expectedPath}`);
         return fs.readJson(expectedPath)
-            .then(item => item.config);
+            .then(item => {
+                return {
+                    config: item.config,
+                    specialMetadata: null
+                };
+            })
+            .catch(err => {
+                logger.error(err);
+                throw err;
+            });
     }
 }
 

lib/utils.js

@@ -144,21 +144,26 @@ exports.getHash = function getHash(object, HashVersion = DefaultHash) {
 };
 
 /***
- * Gets every pair of source, lang available
- * @param content {Array}
- * @returns {Array}
+ * Gets every (source, lang) & (compilerId) available
+ * @param content {Array} GoldenLayout config topmost content field
+ * @returns {Object} contents - Available Editors & Compilers
+ * @returns {Array} contents.editors - Available editors
+ * @returns {Array} contents.compilers - Available compilers
  */
-exports.glGetEditorSources = function glGetEditorSources(content) {
-    let sources = [];
+exports.glGetMainContents = function glGetMainContents(content) {
+    let contents = {editors: [], compilers: []};
     _.each(content, element => {
         if (element.type === 'component') {
             if (element.componentName === 'codeEditor') {
-                sources.push({source: element.componentState.source, language: element.componentState.lang});
+                contents.editors.push({source: element.componentState.source, language: element.componentState.lang});
+            } else if (element.componentName === 'compiler') {
+                contents.compilers.push({compiler: element.componentState.compiler});
             }
         } else {
-            sources = glGetEditorSources(element.content).concat(sources);
+            const subComponents = glGetMainContents(element.content);
+            contents.editors = contents.editors.concat(subComponents.editors);
+            contents.compilers = contents.compilers.concat(subComponents.compilers);
         }
     });
-    return sources;
-
+    return contents;
 };