remove log & fix thumb instead of references

AdFabConnect · Dec 5, 2016 · 5412d5f · 5412d5f
1 parent d532d6d
commit 5412d5f
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 10 deletions.
diff --git a/src/cli/cms/data/source.js b/src/cli/cms/data/source.js
@@ -94,7 +94,7 @@ export function urlList(obj, tplPath, match, jsonPage) {
       }
 
       var body = ''
-console.log(options)
+
       var localReq = httpUse.request(options, (localRes) => {
         localRes.setEncoding('utf8')
         localRes.on('data', (chunk) => {

diff --git a/src/cli/cms/media/image.js b/src/cli/cms/media/image.js
@@ -74,12 +74,6 @@ export function generateThumbnail(file) {
     var cropThumb = smartCropAndSaveFile([250, 250], file, thumbFileName)
     cropThumb.then(function (result) {
       var stderr = result.stderr
-      if(thumbsList != null) {
-        thumbsList.push({
-          originalFile: file.replace(path.join(config.root, config.publish.url), ''),
-          thumbFile: thumbFileNameRelative
-        })
-      }
       if(stderr) {
         cropAndSaveFile([250, 250], file, thumbFileName).then(function () {
           resolve({thumb: thumbFileNameRelative})

diff --git a/src/cli/core/manager/Manager.js b/src/cli/core/manager/Manager.js
@@ -203,6 +203,10 @@ class Manager {
     return this._thumbs
   }
 
+  addThumbsToList(thumb) {
+    if(this._thumbs) this._thumbs.push(thumb)
+  }
+
   getReferences() {
     if(typeof this._references === 'undefined' || this._references === null) this.updateReferences()
     return this._references

diff --git a/src/server/routes/get-thumbs.js b/src/server/routes/get-thumbs.js
@@ -4,7 +4,7 @@ import {
 
 var route = function(req, res){
   res.set('Content-Type', 'application/json')
-  res.send(JSON.stringify({thumbs: Manager.instance.getReferences()}))
+  res.send(JSON.stringify({thumbs: Manager.instance.getThumbsList()}))
 }
 
 export default route
diff --git a/src/server/routes/post-upload.js b/src/server/routes/post-upload.js
@@ -1,6 +1,7 @@
 import {
   abeExtend,
-  cmsMedia
+  cmsMedia,
+  Manager
 } from '../../cli'
 
 var route = function(req, res, next){
@@ -10,6 +11,10 @@ var route = function(req, res, next){
   var image = cmsMedia.image.saveFile(req)
 
   image.then(function (resp) {
+    Manager.instance.addThumbsToList({
+      originalFile: resp.filePath,
+      thumbFile: resp.thumbnail
+    })
     res.set('Content-Type', 'application/json')
     res.send(JSON.stringify(resp))
   }).catch(function(e) {

diff --git a/src/tasks/nodemon.js b/src/tasks/nodemon.js
@@ -19,7 +19,7 @@ nodemon({
     'NODE_ENV': 'development'
   },
   ignore: [
-    // 'docs/*'
+    // 'docs/*' //TODO: find out why in dev mode this line uncommented break server reload on file change
   ],
   watch: [
     'src/cli/*',