fix:Windows create/duplicate post

Committer: gregorybesson <bessong@gmail.com>

src/cli/cms/data/file.js

@@ -113,12 +113,15 @@ export function fromUrl(url) {
 
   if(url != null) {
 
-    var dir = path.dirname(url).replace(config.root, '')
-    var filename = path.basename(url)
-    var link = url.replace(config.root, '')
-    link = link.replace(/^\//, '').split('/')
-    link.shift()
-    link = cmsData.fileAttr.delete('/' + link.join('/').replace(/\/$/, ''))
+    const dir = path.dirname(url).replace(config.root, '')
+    const filename = path.basename(url)
+    const pathDraft = path.join(config.root,config.draft.url,path.sep)
+    const pathPublish = path.join(config.root,config.publish.url,path.sep)
+
+    let link = url.replace(pathDraft, '')
+    link = link.replace(pathPublish, '')
+    link = link.replace(path.sep, '/')
+    link = cmsData.fileAttr.delete('/'+link)
 
     let draft = config.draft.url
     let publish = config.publish.url

test/attributes.js

@@ -1,7 +1,8 @@
 var chai = require('chai');
+var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsData = require('../src/cli').cmsData;
 var Manager = require('../src/cli').Manager;

test/config.js

@@ -1,6 +1,8 @@
 var chai = require('chai');
+var path = require('path');
+
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 describe('Config', function() {
   /**

test/file-attr.js

@@ -1,7 +1,8 @@
 var chai = require('chai');
+var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsData = require('../src/cli').cmsData;
 var Manager = require('../src/cli').Manager;

test/operations.js

@@ -2,7 +2,7 @@ var chai = require('chai');
 var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures/'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsOperations = require('../src/cli').cmsOperations
 var Manager = require('../src/cli').Manager;
@@ -16,9 +16,9 @@ describe('Create', function() {
         Manager.instance.updateList()
 
         this.fixture = {
-          tag: fse.readFileSync(__dirname + '/fixtures/templates/article.html', 'utf8'),
-          jsonArticle: fse.readJsonSync(__dirname + '/fixtures/files/article-4.json'),
-          jsonHomepage: fse.readJsonSync(__dirname + '/fixtures/data/homepage-1.json')
+          tag: fse.readFileSync(path.join(__dirname, 'fixtures/templates/article.html'), 'utf8'),
+          jsonArticle: fse.readJsonSync(path.join(__dirname, '/fixtures/files/article-4.json')),
+          jsonHomepage: fse.readJsonSync(path.join(__dirname, '/fixtures/data/homepage-1.json'))
         }
         done()
 
@@ -33,6 +33,7 @@ describe('Create', function() {
     cmsOperations.create('article', '', 'article-2.html', {query: ''}, this.fixture.jsonArticle, false)
       .then(function(resSave) {
         var json = path.join(config.root, config.data.url, resSave.abe_meta.latest.abeUrl.replace('.html', '.json'))
+        console.log(json)
         var stat = fse.statSync(json)
         if (stat) {
           chai.expect(stat).to.not.be.undefined;

test/plugin.js

@@ -1,7 +1,8 @@
 var chai = require('chai');
+var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var abeExtend = require('../src/cli').abeExtend;
 var Plugins = require('../src/cli').Plugins;

test/process.js

@@ -1,7 +1,8 @@
 var chai = require('chai');
+var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var Manager = require('../src/cli').Manager;
 var abeExtend = require('../src/cli').abeExtend;

test/reference.js

@@ -2,7 +2,7 @@ var chai = require('chai');
 var path = require('path')
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsReference = require('../src/cli').cmsReference;
 

test/regex.js

@@ -2,7 +2,7 @@ var chai = require('chai');
 var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsData = require('../src/cli').cmsData
 var Manager = require('../src/cli').Manager;

test/request.js

@@ -2,7 +2,7 @@ var chai = require('chai');
 var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsData = require('../src/cli').cmsData
 var Manager = require('../src/cli').Manager;

test/revision.js

@@ -2,7 +2,7 @@ var chai = require('chai');
 var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsData = require('../src/cli').cmsData
 var Manager = require('../src/cli').Manager;

test/sort.js

@@ -1,7 +1,9 @@
 var chai = require('chai');
+var path = require('path');
 var fse = require('fs-extra');
+
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var Manager = require('../src/cli').Manager;
 var coreUtils = require('../src/cli').coreUtils

test/templates.js

@@ -2,7 +2,7 @@ var chai = require('chai');
 var path = require('path');
 
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 var cmsTemplates = require('../src/cli').cmsTemplates;
 var Manager = require('../src/cli').Manager;

test/url.js

@@ -1,9 +1,10 @@
 var chai = require('chai');
+var path = require('path');
 
 var coreUtils = require('../src/cli').coreUtils
 var fse = require('fs-extra')
 var config = require('../src/cli').config
-config.set({root: __dirname + '/fixtures'})
+config.set({root: path.join(__dirname,'fixtures')})
 
 describe('Url', function() {