List directories instead of files when caching algorithms

64json · 64json · commit cd1d30dce5f7 · 2018-12-08T20:42:02.000-05:00
diff --git a/src/backend/common/util.js b/src/backend/common/util.js
@@ -1,5 +1,6 @@
 import Promise from 'bluebird';
 import child_process from 'child_process';
+import path from 'path';
 import fs from 'fs-extra';
 
 const execute = (command, cwd, { stdout = process.stdout, stderr = process.stderr } = {}) => new Promise((resolve, reject) => {
@@ -22,11 +23,17 @@ const spawn = (command, args, cwd, { stdout = process.stdout, stderr = process.s
 
 const createKey = name => name.toLowerCase().replace(/ /g, '-');
 
+const isDirectory = dirPath => fs.lstatSync(dirPath).isDirectory();
+
 const listFiles = dirPath => fs.readdirSync(dirPath).filter(fileName => !fileName.startsWith('.'));
 
+const listDirectories = dirPath => listFiles(dirPath).filter(fileName => isDirectory(path.resolve(dirPath, fileName)));
+
 export {
   execute,
   spawn,
   createKey,
+  isDirectory,
   listFiles,
+  listDirectories,
 };
diff --git a/src/backend/controllers/algorithms.js b/src/backend/controllers/algorithms.js
@@ -4,7 +4,7 @@ import fs from 'fs-extra';
 import path from 'path';
 import { NotFoundError } from '/common/error';
 import { GitHubApi } from '/apis';
-import { createKey, execute, listFiles } from '/common/util';
+import { createKey, execute, listDirectories, listFiles } from '/common/util';
 import webhook from '/common/webhook';
 
 const router = express.Router();
@@ -38,7 +38,7 @@ const cacheAlgorithm = (categoryName, algorithmName) => {
 const cacheCategory = categoryName => {
   const categoryKey = createKey(categoryName);
   const categoryPath = getPath(categoryName);
-  const algorithms = listFiles(categoryPath).map(algorithmName => cacheAlgorithm(categoryName, algorithmName));
+  const algorithms = listDirectories(categoryPath).map(algorithmName => cacheAlgorithm(categoryName, algorithmName));
   return {
     key: categoryKey,
     name: categoryName,
@@ -82,7 +82,7 @@ const cacheContributors = (files, commitAuthors) => Promise.each(files, file =>
 });
 
 const cacheCategories = () => {
-  const categories = listFiles(getPath()).map(cacheCategory);
+  const categories = listDirectories(getPath()).map(cacheCategory);
 
   const files = [];
   categories.forEach(category => category.algorithms.forEach(algorithm => files.push(...algorithm.files)));
@@ -91,19 +91,19 @@ const cacheCategories = () => {
   return categories;
 };
 
+let categories = [];
 const downloadCategories = () => (
   fs.pathExistsSync(repoPath) ?
     execute(`git fetch && git reset --hard origin/master`, repoPath) :
     execute(`git clone https://github.com/algorithm-visualizer/algorithms.git ${repoPath}`, __dirname)
-);
+).then(() => categories = cacheCategories());
 
-let categories = [];
-downloadCategories().then(() => categories = cacheCategories());
+downloadCategories().catch(console.error);
 
 webhook.on('algorithms', event => {
   switch (event) {
     case 'push':
-      downloadCategories().then(() => categories = cacheCategories());
+      downloadCategories().catch(console.error);
       break;
   }
 });
diff --git a/src/backend/controllers/tracers.js b/src/backend/controllers/tracers.js
@@ -32,12 +32,12 @@ const buildRelease = release => (
     execute(`git clone https://github.com/algorithm-visualizer/tracers.git ${repoPath}`, __dirname)
 ).then(() => execute(`git reset --hard ${release.target_commitish} && npm install && npm run build && ./bin/build`, repoPath));
 
-GitHubApi.getLatestRelease('algorithm-visualizer', 'tracers').then(buildRelease);
+GitHubApi.getLatestRelease('algorithm-visualizer', 'tracers').then(buildRelease).catch(console.error);
 
 webhook.on('tracers', (event, data) => {
   switch (event) {
     case 'release':
-      buildRelease(data.release);
+      buildRelease(data.release).catch(console.error);
       break;
   }
 });
