update for ghost 1.x

index.js

@@ -4,105 +4,113 @@ var path = require('path')
 var Promise = require('bluebird')
 var OSS = require('ali-oss').Wrapper
 
-var utils = require(path.join(process.cwd(), 'core/server/utils'))
-var baseStore = require(path.join(process.cwd(), 'core/server/storage/base'))
-
-function OssStore(config) {  
-  baseStore.call(this);
-  this.options = config || {}
-  this.client = new OSS(this.options)  
-}
-
-util.inherits(OssStore, baseStore);
-
-OssStore.prototype.save = function (file, targetDir) {
-  var client = this.client
-  var origin = this.options.origin  
-  var key = this.getFileKey(file)
-
-  return new Promise(function (resolve, reject) {
-    return client.put(
-      key, 
-      fs.createReadStream(file.path)
-    )
-    .then(function (result) {
-      // console.log(result)
-      if(origin){
-        resolve(path.join(origin, result.name))
-      }else{
-        resolve(result.url)
-      }      
-    })
-    .catch(function (err) {
-      // console.log(err)
-      reject(false)
-    })
-  })
+try {
+  var utils = require(path.join(process.cwd(), 'core/server/utils')) // for ghost-docker
+} catch {
+  var utils = var utils = require(path.join(process.cwd(), 'current/core/server/utils'))
 }
+var baseStore = require('ghost-storage-base')
 
-OssStore.prototype.exists = function (filename) {
-  // console.log('exists',filename)
-  var client = this.client  
+class OssStore extends baseStore {
+  constructor (config) {
+    super(config)
+    this.options = config || {}
+    this.client = new OSS(this.options)
+  }
 
-  return new Promise(function (resolve, reject) {
-    return client.head(filename).then(function (result) {
-      // console.log(result)
-      resolve(true)
-    }).catch(function (err) {
-      // console.log(err)
-      reject(false)
+  save (file, targetDir) {
+    var client = this.client
+    var origin = this.options.origin  
+    var key = this.getFileKey(file)
+
+    return new Promise(function (resolve, reject) {
+      return client.put(
+        key, 
+        fs.createReadStream(file.path)
+      )
+      .then(function (result) {
+        // console.log(result)
+        if(origin){
+          resolve(path.join(origin, result.name))
+        }else{
+          resolve(result.url)
+        }      
+      })
+      .catch(function (err) {
+        // console.log(err)
+        reject(false)
+      })
     })
-
-  })
-}
-
-OssStore.prototype.serve = function (options) {  
-  return function (req, res, next) {
-    next();
   }
-}
-
-OssStore.prototype.delete = function (filename) {
-  var client = this.client  
 
-  // console.log('del',filename)
-  return new Promise(function (resolve, reject) {
-    return client.delete(filename).then(function (result) {
-      // console.log(result)
-      resolve(true)
-    }).catch(function (err) {
-      // console.log(err)
-      reject(false)
+  exists (filename) {
+    // console.log('exists',filename)
+    var client = this.client  
+
+    return new Promise(function (resolve, reject) {
+      return client.head(filename).then(function (result) {
+        // console.log(result)
+        resolve(true)
+      }).catch(function (err) {
+        // console.log(err)
+        reject(false)
+      })
+
     })
-  })
-}
-
-OssStore.prototype.getFileKey = function (file) {
-  var keyOptions = this.options.fileKey
-
-  if (keyOptions) {
-    var getValue = function (obj) {
-      return typeof obj === 'function' ? obj() : obj
-    };
-    var ext = path.extname(file.name)
-    var name = path.basename(file.name, ext)
-
-    if (keyOptions.safeString) {
-      name = utils.safeString(name)
+  }
+
+  serve (options) {  
+    return function (req, res, next) {
+      next();
     }
+  }
+
+  delete (filename) {
+    var client = this.client  
+
+    // console.log('del',filename)
+    return new Promise(function (resolve, reject) {
+      return client.delete(filename).then(function (result) {
+        // console.log(result)
+        resolve(true)
+      }).catch(function (err) {
+        // console.log(err)
+        reject(false)
+      })
+    })
+  }
 
-    if (keyOptions.prefix) {
-      name = path.join(keyOptions.prefix, name);
-    }
+  read () {
 
-    if (keyOptions.suffix) {
-      name += getValue(keyOptions.suffix)
+  }
+
+  getFileKey (file) {
+    var keyOptions = this.options.fileKey
+
+    if (keyOptions) {
+      var getValue = function (obj) {
+        return typeof obj === 'function' ? obj() : obj
+      };
+      var ext = path.extname(file.name)
+      var name = path.basename(file.name, ext)
+
+      if (keyOptions.safeString) {
+        name = utils.safeString(name)
+      }
+
+      if (keyOptions.prefix) {
+        name = path.join(keyOptions.prefix, name);
+      }
+
+      if (keyOptions.suffix) {
+        name += getValue(keyOptions.suffix)
+      }
+
+      return name + ext.toLowerCase();
     }
-
-    return name + ext.toLowerCase();
+  
+    return null;
   }
-
-  return null;
 }
 
-module.exports = OssStore
+module.exports = OssStore

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ghost-oss-store",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "Ghost Aliyun Oss storage module.",
   "main": "index.js",
   "scripts": {
@@ -9,11 +9,12 @@
   "repository": {
     "type": "git",
     "url": "git@github.com:MT-Libraries/ghost-oss-store.git"
-  },  
+  },
   "author": "Thonatos.Yang",
   "license": "MIT",
   "dependencies": {
     "ali-oss": "^4.4.4",
-    "bluebird": "^3.4.6"
+    "bluebird": "^3.4.6",
+    "ghost-storage-base": "^0.0.1"
   }
 }