refactoring: save

abecms · Oct 5, 2016 · 14cf168 · 14cf168
1 parent 9899dff
commit 14cf168
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 24 deletions.
diff --git a/src/cli/cms/operations/create.js b/src/cli/cms/operations/create.js
@@ -5,7 +5,7 @@ import {
   Util,
   cleanSlug,
   cmsTemplate,
-  save,
+  cmsOperations,
   config,
   Hooks,
   cmsData,
@@ -38,7 +38,7 @@ var create = function(template, pathCreate, name, req, forceJson = {}, duplicate
         text = resHook.text
 
         Hooks.instance.trigger('afterCreate', json, text, pathCreate, name, req, forceJson)
-        save(filePath, template, json, text, 'draft', null, 'draft')
+        cmsOperations.save.save(filePath, template, json, text, 'draft', null, 'draft')
             .then((resSave) => {
               Manager.instance.updateList()
               filePath = resSave.htmlPath

diff --git a/src/cli/cms/operations/index.js b/src/cli/cms/operations/index.js
@@ -1,7 +1,9 @@
 import create from './create'
 import duplicate from './duplicate'
+import * as save from './save'
 
 export {
 	create
 	,duplicate
+	,save
 }
diff --git a/src/cli/core/utils/file-parser.js b/src/cli/core/utils/file-parser.js
@@ -8,7 +8,7 @@ import path from 'path'
 import {
 	cli
   ,cmsData
-	,save
+	,cmsOperations
 	,folderUtils
 	,fileUtils
 	,config
@@ -440,7 +440,7 @@ export default class FileParser {
         delete json.abe_meta.publish
       }
 
-      save(
+      cmsOperations.save.save(
 	      fileUtils.getFilePath(json.abe_meta.link),
 	      json.abe_meta.template,
 	      json,

diff --git a/src/cli/index.js b/src/cli/index.js
@@ -48,8 +48,6 @@ import Create from './cms/Create'
 
 import config from './core/config/config'
 
-import {save, checkRequired, saveJson} from './cms/operations/save'
-
 import abeProcess from './extend/abe-process'
 import Hooks from './extend/abe-hooks'
 import Plugins from './extend/abe-plugins'
@@ -95,12 +93,9 @@ export {
 	,ifIn
 	,ifCond
 	,config
-	,save
 	,Hooks
 	,Plugins
 	,Locales
-	,checkRequired
-	,saveJson
 	,dateSlug
 	,dateUnslug
 	,Manager

diff --git a/src/cli/process/publish-all.js b/src/cli/process/publish-all.js
@@ -43,7 +43,7 @@ function publishNext(published, tt, cb, i = 0) {
       var p = new Promise((resolve, reject) => {
         try {
 
-          save(
+          cmsOperations.save.save(
             pub.path,
             json.abe_meta.template,
             null,
@@ -104,7 +104,7 @@ if(typeof pConfig.ABE_WEBSITE !== 'undefined' && pConfig.ABE_WEBSITE !== null) {
     var FileParser = require('../../cli').FileParser
     var fileUtils = require('../../cli').fileUtils
     var folderUtils = require('../../cli').folderUtils
-    var save = require('../../cli').save
+    var cmsOperations = require('../../cli').cmsOperations
     var Manager = require('../../cli').Manager
 
     Manager.instance.init()

diff --git a/src/cli/process/update-json.js b/src/cli/process/update-json.js
@@ -6,7 +6,6 @@ import {
   ,FileParser
   ,fileUtils
   ,folderUtils
-  ,save
   ,Hooks
 } from '../../cli'
 

diff --git a/src/server/controllers/index.js b/src/server/controllers/index.js
@@ -29,7 +29,6 @@ import {
 } from '../routes'
 
 import {
-  save,
   Util,
   FileParser,
   fileUtils,

diff --git a/src/server/middlewares/website.js b/src/server/middlewares/website.js
@@ -10,7 +10,6 @@ import xss from 'xss'
 import pkg from '../../../package'
 
 import {
-  save,
   Util,
   FileParser,
   fileUtils,

diff --git a/src/server/routes/get-create.js b/src/server/routes/get-create.js
@@ -4,7 +4,6 @@ import {
   Util,
   cleanSlug,
   config,
-  save,
   cmsOperations,
   Hooks
 } from '../../cli'

diff --git a/src/server/routes/get-list-hooks.js b/src/server/routes/get-list-hooks.js
@@ -7,7 +7,6 @@ import {
   Util,
   cleanSlug,
   config,
-  save,
   Hooks,
   Plugins
 } from '../../cli'

diff --git a/src/server/routes/post-draft.js b/src/server/routes/post-draft.js
@@ -1,5 +1,5 @@
 import {
-  save,
+  cmsOperations,
   fileUtils,
   Hooks,
   Manager
@@ -8,7 +8,7 @@ import {
 var route = function(req, res, next){
   Hooks.instance.trigger('beforeRoute', req, res, next)
   if(typeof res._header !== 'undefined' && res._header !== null) return
-  save(
+  cmsOperations.save.save(
     fileUtils.getFilePath(req.body.filePath),
     req.body.tplPath,
     req.body.json,

diff --git a/src/server/routes/post-publish.js b/src/server/routes/post-publish.js
@@ -1,6 +1,6 @@
 import {
   fileUtils,
-  save,
+  cmsOperations,
   cleanSlug,
   Hooks,
   Manager
@@ -12,7 +12,7 @@ var route = function(req, res, next){
 
   var filePath = cleanSlug(req.body.filePath)
   var p = new Promise((resolve) => {
-    save(
+    cmsOperations.save.save(
       fileUtils.getFilePath(filePath),
       req.body.tplPath,
       req.body.json,
@@ -28,7 +28,7 @@ var route = function(req, res, next){
   })
 
   p.then((resSave) => {
-    save(
+    cmsOperations.save.save(
       fileUtils.getFilePath(req.body.filePath),
       req.body.tplPath,
       req.body.json,

diff --git a/src/server/routes/post-reject.js b/src/server/routes/post-reject.js
@@ -1,5 +1,5 @@
 import {
-  save,
+  cmsOperations,
   fileUtils,
   Hooks,
   Manager
@@ -10,7 +10,7 @@ var route = function(req, res, next){
   if(typeof res._header !== 'undefined' && res._header !== null) return
 
   var p = new Promise((resolve) => {
-    save(
+    cmsOperations.save.save(
       fileUtils.getFilePath(req.body.filePath),
       req.body.tplPath,
       req.body.json,
@@ -26,7 +26,7 @@ var route = function(req, res, next){
   })
 
   p.then((resSave) => {
-    save(
+    cmsOperations.save.save(
       fileUtils.getFilePath(req.body.filePath),
       req.body.tplPath,
       req.body.json,