fix(plugin-media): handling stream errors for fs

origami-cms · Jan 20, 2019 · 591b946 · 591b946
1 parent 9054511
commit 591b946
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/packages/admin/src/components/pages/Admin/Media/PageMedia.ts b/packages/admin/src/components/pages/Admin/Media/PageMedia.ts
@@ -24,7 +24,7 @@ export class PageMedia extends connect(store)(LitElement) {
   }
 
   public render() {
-    const animation = 0.025;
+    const animation = 0.0125;
     return html`
       ${CSS}
       ${this._loading
@@ -36,7 +36,9 @@ export class PageMedia extends connect(store)(LitElement) {
               <ui-image src="/api/v1/media/${r.id}?width=400" />
             </div>
             <div class="details">
-              <span>${r.name}</span>
+              <span>
+                ${r.name}
+              </span>
               <ui-avatar user="${r.author}"></ui-avatar>
             </div>
           </li>

diff --git a/packages/plugin-media/src/providers/filesystem.ts b/packages/plugin-media/src/providers/filesystem.ts
@@ -85,9 +85,13 @@ export const handlerGet = (
   res.header('content-type', file.type);
 
 
-  try {
-    let stream: Readable = fs.createReadStream(path.resolve(location, file.id));
+  let stream: Readable = fs.createReadStream(path.resolve(location, file.id));
+  stream.on('error', (err) => {
+    next(err);
+    return;
+  });
 
+  try {
     if (req.query.width) {
       const width = parseInt(req.query.width);
       if (typeof width === 'number') {
@@ -98,7 +102,6 @@ export const handlerGet = (
     res.locals.content.set(stream);
     next();
 
-
   } catch (e) {
     next(e);
   }