Fix backslash bug on Windows

tommy351 · tommy351 · commit 2876fafd559b · 2015-01-05T19:34:30.000+08:00
diff --git a/lib/box/index.js b/lib/box/index.js
@@ -6,7 +6,6 @@ var util = require('hexo-util');
 var fs = require('hexo-fs');
 var prettyHrtime = require('pretty-hrtime');
 var crypto = require('crypto');
-var tildify = require('tildify');
 var chalk = require('chalk');
 
 var Pattern = util.Pattern;
@@ -212,6 +211,8 @@ Box.prototype._handleUpdatedFile = function(path){
     self.bufferStore[path] = data.content;
 
     if (!cache){
+      ctx.log.info('Added: %s', chalk.magenta(id));
+
       return Cache.insert({
         _id: id,
         checksum: checksum
@@ -220,11 +221,15 @@ Box.prototype._handleUpdatedFile = function(path){
         path: path
       });
     } else if (cache.checksum === checksum){
+      ctx.log.info('Unchanged: %s', chalk.magenta(id));
+
       return {
         type: 'skip',
         path: path
       };
     } else {
+      ctx.log.info('Updated: %s', chalk.magenta(id));
+
       cache.checksum = checksum;
       return cache.save().thenReturn({
         type: 'update',
@@ -246,6 +251,7 @@ Box.prototype._handleDeletedFile = function(path){
     var cache = Cache.findById(id);
     if (!cache) return resolve();
 
+    ctx.log.debug('Deleted: %s', chalk.magenta(id));
     return cache.remove().then(resolve, reject);
   }).thenReturn({
     type: 'delete',
@@ -350,24 +356,17 @@ Box.prototype.watch = function(callback){
     self.watcher = watcher;
 
     watcher.on('add', function(path){
-      log.info('Added: %s', displayPath(path));
       self._handleUpdatedFile(getPath(path)).then(dispatch);
     }).on('change', function(path){
-      log.info('Updated: %s', displayPath(path));
       self._handleUpdatedFile(getPath(path)).then(dispatch);
     }).on('unlink', function(path){
-      log.info('Deleted: %s', displayPath(path));
       self._handleDeletedFile(getPath(path)).then(dispatch);
     });
 
     return watcher;
   }).nodeify(callback);
 };
 
-function displayPath(path){
-  return chalk.magenta(tildify(path));
-}
-
 Box.prototype.unwatch = function(){
   if (!this.watcher) throw new Error('Watcher hasn\'t started yet.');
 
diff --git a/lib/plugins/helper/css.js b/lib/plugins/helper/css.js
@@ -1,5 +1,3 @@
-var pathFn = require('path');
-
 function cssHelper(){
   var result = '';
   var path = '';
@@ -10,7 +8,7 @@ function cssHelper(){
     if (Array.isArray(path)){
       result += cssHelper.apply(this, path);
     } else {
-      if (pathFn.extname(path) !== '.css') path += '.css';
+      if (path.substring(path.length - 4, path.length) !== '.css') path += '.css';
       result += '<link rel="stylesheet" href="' + this.url_for(path) + '" type="text/css">\n';
     }
   }
diff --git a/lib/plugins/helper/js.js b/lib/plugins/helper/js.js
@@ -1,5 +1,3 @@
-var pathFn = require('path');
-
 function jsHelper(){
   var result = '';
   var path = '';
@@ -10,7 +8,7 @@ function jsHelper(){
     if (Array.isArray(path)){
       result += jsHelper.apply(this, path);
     } else {
-      if (pathFn.extname(path) !== '.js') path += '.js';
+      if (path.substring(path.length - 3, path.length) !== '.js') path += '.js';
       result += '<script src="' + this.url_for(path) + '" type="text/javascript"></script>\n';
     }
   }
diff --git a/lib/plugins/processor/asset.js b/lib/plugins/processor/asset.js
@@ -74,7 +74,7 @@ function processPage(file){
 }
 
 function processAsset(file){
-  var id = file.source.substring(this.base_dir.length);
+  var id = file.source.substring(this.base_dir.length).replace(/\\/g, '/');
   var Asset = this.model('Asset');
   var doc = Asset.findById(id);
 
diff --git a/lib/plugins/processor/post.js b/lib/plugins/processor/post.js
@@ -204,7 +204,7 @@ function scanAssetDir(post){
   }).filter(function(item){
     return !common.isTmpFile(item) && !common.isHiddenFile(item);
   }).map(function(item){
-    var id = pathFn.join(assetDir, item).substring(baseDirLength);
+    var id = pathFn.join(assetDir, item).substring(baseDirLength).replace(/\\/g, '/');
     var asset = PostAsset.findById(id);
     if (asset) return;
 
@@ -220,7 +220,7 @@ function scanAssetDir(post){
 function processAsset(file){
   var PostAsset = this.model('PostAsset');
   var Post = this.model('Post');
-  var id = file.source.substring(this.base_dir.length);
+  var id = file.source.substring(this.base_dir.length).replace(/\\/g, '/');
   var doc = PostAsset.findById(id);
   var post;
 
diff --git a/lib/theme/processors/source.js b/lib/theme/processors/source.js
@@ -3,7 +3,7 @@ var common = require('../../plugins/processor/common');
 
 exports.process = function(file){
   var Asset = this.model('Asset');
-  var id = file.source.substring(this.base_dir.length);
+  var id = file.source.substring(this.base_dir.length).replace(/\\/g, '/');
   var path = file.params.path;
   var doc = Asset.findById(id);
 
diff --git a/package.json b/package.json
@@ -39,11 +39,11 @@
     "bluebird": "^2.3.11",
     "bunyan": "^1.2.1",
     "chalk": "^0.5.1",
-    "cheerio": "0.17.0",
+    "cheerio": "0.18.0",
     "hexo-front-matter": "0.0.4",
     "hexo-fs": "0.0.7",
     "hexo-util": "0.0.2",
-    "js-yaml": "^3.1.0",
+    "js-yaml": "^3.2.5",
     "lodash": "^2.4.1",
     "minimist": "1.1.0",
     "moment": "2.8.4",

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-var pathFn = require('path');`
`2`		`-`
`3`	`1`	`function cssHelper(){`
`4`	`2`	`var result = '';`
`5`	`3`	`var path = '';`
`@@ -10,7 +8,7 @@ function cssHelper(){`
`10`	`8`	`if (Array.isArray(path)){`
`11`	`9`	`result += cssHelper.apply(this, path);`
`12`	`10`	`} else {`
`13`		`- if (pathFn.extname(path) !== '.css') path += '.css';`
	`11`	`+ if (path.substring(path.length - 4, path.length) !== '.css') path += '.css';`
`14`	`12`	`result += '<link rel="stylesheet" href="' + this.url_for(path) + '" type="text/css">\n';`
`15`	`13`	`}`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-var pathFn = require('path');`
`2`		`-`
`3`	`1`	`function jsHelper(){`
`4`	`2`	`var result = '';`
`5`	`3`	`var path = '';`
`@@ -10,7 +8,7 @@ function jsHelper(){`
`10`	`8`	`if (Array.isArray(path)){`
`11`	`9`	`result += jsHelper.apply(this, path);`
`12`	`10`	`} else {`
`13`		`- if (pathFn.extname(path) !== '.js') path += '.js';`
	`11`	`+ if (path.substring(path.length - 3, path.length) !== '.js') path += '.js';`
`14`	`12`	`result += '<script src="' + this.url_for(path) + '" type="text/javascript"></script>\n';`
`15`	`13`	`}`
`16`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ function processPage(file){`
`74`	`74`	`}`
`75`	`75`
`76`	`76`	`function processAsset(file){`
`77`		`- var id = file.source.substring(this.base_dir.length);`
	`77`	`+ var id = file.source.substring(this.base_dir.length).replace(/\\/g, '/');`
`78`	`78`	`var Asset = this.model('Asset');`
`79`	`79`	`var doc = Asset.findById(id);`
`80`	`80`