refactoring: remove folderUtils

abecms · Oct 7, 2016 · db4e0d9 · db4e0d9
1 parent f639117
commit db4e0d9
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 56 deletions.
diff --git a/src/cli/cms/data/revision.js b/src/cli/cms/data/revision.js
@@ -119,4 +119,19 @@ export function getStatusAndDateToFileName(date) {
 
 export function removeStatusAndDateFromFileName(date) {
   return date.replace(/[-:\.]/g, '')
+}
+
+export function filePathInfos(pathFolder) {
+  var pathArr = pathFolder.split('/')
+  var name = pathArr[pathArr.length - 1]
+
+  var rootArr = config.root.split('/')
+  var website = rootArr[pathArr.length - 1]
+  return {
+    'name': name,
+    'path': pathFolder,
+    'website': website,
+    'cleanPath': fileUtils.cleanPath(pathFolder.replace(config.root, '')),
+    'type': 'folder'
+  }
 }
diff --git a/src/cli/core/utils/file-parser.js b/src/cli/core/utils/file-parser.js
@@ -12,7 +12,6 @@ import {
 	,fileUtils
 	,config
   ,Hooks
-	,folderUtils
 	,Plugins
   ,Manager
 } from '../../'
@@ -209,7 +208,7 @@ export default class FileParser {
   }
 
   static getProjectFiles() {
-    var site = folderUtils.folderInfos(config.root)
+    var site = cmsData.revision.filePathInfos(config.root)
     var result = {'structure': [], 'templates': []}
 
     let structure = config.structure.url
@@ -408,7 +407,7 @@ export default class FileParser {
   }
 
   static getAllFilesWithKeys(withKeys) {
-    var site = folderUtils.folderInfos(config.root)
+    var site = cmsData.revision.filePathInfos(config.root)
 
     var files = FileParser.getFiles(path.join(config.root, config.data.url), true, 99, /\.json/)
     var filesArr = []

diff --git a/src/cli/core/utils/folder-utils.js b/src/cli/core/utils/folder-utils.js
diff --git a/src/cli/index.js b/src/cli/index.js
@@ -37,7 +37,6 @@ import Page from './cms/Page'
 
 import FileParser from './core/utils/file-parser'
 import fileUtils from './core/utils/file-utils'
-import folderUtils from './core/utils/folder-utils'
 
 // import {getTemplate} from './cms/templates/abe-template'
 import Create from './cms/Create'
@@ -67,7 +66,6 @@ export {
 	,Handlebars
 	,clc
 	,FileParser
-	,folderUtils
 	,fileUtils
 	,printInput
 	,abeImport

diff --git a/src/cli/process/publish-all.js b/src/cli/process/publish-all.js
@@ -103,7 +103,6 @@ if(typeof pConfig.ABE_WEBSITE !== 'undefined' && pConfig.ABE_WEBSITE !== null) {
     var controllers = require('../../server/controllers')
     var FileParser = require('../../cli').FileParser
     var fileUtils = require('../../cli').fileUtils
-    var folderUtils = require('../../cli').folderUtils
     var cmsOperations = require('../../cli').cmsOperations
     var Manager = require('../../cli').Manager
 

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

diff --git a/src/server/controllers/index.js b/src/server/controllers/index.js
@@ -31,7 +31,6 @@ import {
 import {
   FileParser,
   fileUtils,
-  folderUtils,
   config,
   Page,
   abeProcess,

diff --git a/src/server/middlewares/website.js b/src/server/middlewares/website.js
@@ -13,7 +13,6 @@ import {
   Util,
   FileParser,
   fileUtils,
-  folderUtils,
   config,
   Page,
   abeProcess,

diff --git a/src/server/routes/get-logs.js b/src/server/routes/get-logs.js
@@ -5,7 +5,6 @@ import mkdirp from 'mkdirp'
 import {
   FileParser,
   fileUtils,
-  folderUtils,
   config
 } from '../../cli'