Merge pull request #96 from adorableio/use-utils

Use avatars-utils

Author: rylnd

package-lock.json

@@ -22,6 +22,7 @@
     "dist"
   ],
   "dependencies": {
+    "avatars-utils": "^0.0.3",
     "express": "^4.16.4",
     "gm": "^1.16.0",
     "uuid": "^3.3.2"
@@ -38,7 +39,7 @@
     "@types/serve-favicon": "^2.2.30",
     "chai": "^4.2.0",
     "concurrently": "^4.1.0",
-    "mocha": "^6.1.3",
+    "mocha": "^6.1.4",
     "onchange": "^5.2.0",
     "prettier": "^1.17.0",
     "serve-favicon": "^2.5.0",

package.json

@@ -0,0 +1,49 @@
+import { Hash, hashFactory, sumAndDiff } from 'avatars-utils';
+import { eyeImages, noseImages, mouthImages } from './imageFiles';
+
+export class FaceFactory {
+  private colorHash: Hash<string>;
+  private eyeHash: Hash<string>;
+  private noseHash: Hash<string>;
+  private mouthHash: Hash<string>;
+
+  constructor(
+    colors: string[],
+    eyes: string[],
+    noses: string[],
+    mouths: string[],
+  ) {
+    this.colorHash = new Hash(colors);
+    this.eyeHash = new Hash(eyes);
+    this.noseHash = new Hash(noses);
+    this.mouthHash = new Hash(mouths, hashFactory(sumAndDiff));
+  }
+
+  public create(string): Face {
+    return {
+      color: this.colorHash.get(string),
+      eyes: this.eyeHash.get(string),
+      nose: this.noseHash.get(string),
+      mouth: this.mouthHash.get(string),
+    };
+  }
+}
+
+const defaultColors = [
+  '#81bef1',
+  '#ad8bf2',
+  '#bff288',
+  '#de7878',
+  '#a5aac5',
+  '#6ff2c5',
+  '#f0da5e',
+  '#eb5972',
+  '#f6be5d',
+];
+
+export default new FaceFactory(
+  defaultColors,
+  eyeImages,
+  noseImages,
+  mouthImages,
+);

src/lib/FaceFactory.ts

@@ -1,23 +1,14 @@
-import fs from 'fs';
 import path from 'path';
+import { filePaths, fileNames } from 'avatars-utils';
 
-const IMAGE_DIR = path.join(__dirname, '..', 'img');
+const imageDir = path.join(__dirname, '..', 'img');
 
-const imageFiles: (path: string) => string[] = p =>
-  fs.readdirSync(p).filter(fileName => fileName.match(/\.png$/));
+export const imageFilePaths = (type: string): string[] =>
+  filePaths(path.join(imageDir, type));
 
-const imageDir: (type: ImageType) => string = type =>
-  type ? path.join(IMAGE_DIR, type) : IMAGE_DIR;
+export const imageFileNames = (type: string): string[] =>
+  fileNames(path.join(imageDir, type));
 
-export const allNames: (type: ImageType) => string[] = type =>
-  imageFiles(imageDir(type)).map(imageFileName =>
-    imageFileName.replace(/\.png/, ''),
-  );
-
-export const allPaths: (type: ImageType) => string[] = type => {
-  const dir = imageDir(type);
-  return imageFiles(dir).map(file => path.join(dir, file));
-};
-
-export const pathTo: (type: ImageType, name: string) => string = (type, name) =>
-  path.join(imageDir(type), name + '.png');
+export const eyeImages = imageFilePaths('eyes');
+export const noseImages = imageFilePaths('nose');
+export const mouthImages = imageFilePaths('mouth');

src/lib/hashingFunctions.ts

@@ -1,9 +1,9 @@
 import Router from 'express';
 import uuid from 'uuid';
 
-import { allNames, pathTo } from '../lib/imageFiles';
+import { imageFileNames, imageFilePaths } from '../lib/imageFiles';
 import { combine } from '../lib/imager';
-import potato from '../lib/potato';
+import FaceFactory from '../lib/FaceFactory';
 
 const imageTypes: ImageType[] = ['eyes', 'nose', 'mouth'];
 
@@ -17,23 +17,23 @@ const sendImage = ({ stdout, response }) => {
 
 router.get('/list', (req, res) => {
   const face = {};
-  imageTypes.forEach(type => (face[type] = allNames(type)));
+  imageTypes.forEach(type => (face[type] = imageFileNames(type)));
 
   return res.set('Content-Type', 'application/json').send({ face });
 });
 
 router.get('/:size?/random', (req, res) => {
-  const faceParts = potato.parts(uuid.v4());
+  const face = FaceFactory.create(uuid.v4());
 
-  return combine(faceParts, req.params.size, (err, stdout) =>
+  return combine(face, req.params.size, (err, stdout) =>
     sendImage({ stdout, response: res }),
   );
 });
 
 router.get('/:size?/:id', (req, res, next) => {
-  const faceParts = potato.parts(req.params.id);
+  const face = FaceFactory.create(req.params.id);
 
-  return combine(faceParts, req.params.size, (err, stdout) =>
+  return combine(face, req.params.size, (err, stdout) =>
     sendImage({ stdout, response: res }),
   );
 });
@@ -43,16 +43,13 @@ router.get('/face/:eyes/:nose/:mouth/:color/:size?', (req, res, next) => {
 
   imageTypes.forEach(type => {
     const requestedName = req.params[type];
-    const names = allNames(type);
-    let name = names[0];
+    const paths = imageFilePaths(type);
+    faceParts[type] =
+      paths.find(path => !!path.match(requestedName)) || paths[0];
 
-    if (names.includes(requestedName)) {
-      name = requestedName;
-    } else if (requestedName === 'x') {
-      name = '';
+    if (requestedName === 'x') {
+      faceParts[type] = '';
     }
-
-    faceParts[type] = pathTo(type, name);
   });
 
   return combine(faceParts, req.params.size, (err, stdout) =>