mirror of
https://github.com/fuse-friends/fuse-native
synced 2024-10-27 18:34:01 +00:00
Adding static unmount + force option
This commit is contained in:
parent
de825b61e6
commit
f7dde5d16a
53
index.js
53
index.js
@ -135,6 +135,7 @@ class Fuse extends Nanoresource {
|
|||||||
this.mnt = path.resolve(mnt)
|
this.mnt = path.resolve(mnt)
|
||||||
|
|
||||||
this.ops = ops
|
this.ops = ops
|
||||||
|
this._force = !!opts.force
|
||||||
this._thread = null
|
this._thread = null
|
||||||
this._handlers = this._makeHandlerArray()
|
this._handlers = this._makeHandlerArray()
|
||||||
|
|
||||||
@ -225,28 +226,46 @@ class Fuse extends Nanoresource {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Static methods
|
||||||
|
static unmount (mnt, cb) {
|
||||||
|
const mnt = JSON.stringify(mnt)
|
||||||
|
const cmd = IS_OSX ? `diskutil umount ${mnt}` : `fusermount -uz ${mnt}`
|
||||||
|
exec(cmd, err => {
|
||||||
|
if (err) return cb(err)
|
||||||
|
return cb(null)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
// Lifecycle methods
|
// Lifecycle methods
|
||||||
|
|
||||||
_open (cb) {
|
_open (cb) {
|
||||||
this._thread = Buffer.alloc(binding.sizeof_fuse_thread_t)
|
const self = this
|
||||||
this._openCallback = cb
|
|
||||||
|
|
||||||
const opts = this._fuseOptions()
|
if (this._force) return Fuse.unmount(this.mnt, open)
|
||||||
const implemented = this._getImplementedArray()
|
return open()
|
||||||
|
|
||||||
return fs.stat(this.mnt, (err, stat) => {
|
function open (err) {
|
||||||
if (err) return cb(new Error('Mountpoint does not exist'))
|
if (err) return cb(err)
|
||||||
if (!stat.isDirectory()) return cb(new Error('Mountpoint is not a directory'))
|
this._thread = Buffer.alloc(binding.sizeof_fuse_thread_t)
|
||||||
return fs.stat(path.join(this.mnt, '..'), (_, parent) => {
|
this._openCallback = cb
|
||||||
if (parent && parent.dev !== stat.dev) return cb(new Error('Mountpoint in use'))
|
|
||||||
try {
|
const opts = this._fuseOptions()
|
||||||
// TODO: asyncify
|
const implemented = this._getImplementedArray()
|
||||||
binding.fuse_native_mount(this.mnt, opts, this._thread, this, this._handlers, implemented)
|
|
||||||
} catch (err) {
|
return fs.stat(this.mnt, (err, stat) => {
|
||||||
return cb(err)
|
if (err) return cb(new Error('Mountpoint does not exist'))
|
||||||
}
|
if (!stat.isDirectory()) return cb(new Error('Mountpoint is not a directory'))
|
||||||
|
return fs.stat(path.join(this.mnt, '..'), (_, parent) => {
|
||||||
|
if (parent && parent.dev !== stat.dev) return cb(new Error('Mountpoint in use'))
|
||||||
|
try {
|
||||||
|
// TODO: asyncify
|
||||||
|
binding.fuse_native_mount(this.mnt, opts, this._thread, this, this._handlers, implemented)
|
||||||
|
} catch (err) {
|
||||||
|
return cb(err)
|
||||||
|
}
|
||||||
|
})
|
||||||
})
|
})
|
||||||
})
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
_close (cb) {
|
_close (cb) {
|
||||||
@ -255,7 +274,7 @@ class Fuse extends Nanoresource {
|
|||||||
const mnt = JSON.stringify(this.mnt)
|
const mnt = JSON.stringify(this.mnt)
|
||||||
const cmd = IS_OSX ? `diskutil umount ${mnt}` : `fusermount -uz ${mnt}`
|
const cmd = IS_OSX ? `diskutil umount ${mnt}` : `fusermount -uz ${mnt}`
|
||||||
|
|
||||||
exec(cmd, (err, stdout, stderr) => {
|
Fuse.unmount(mnt, err => {
|
||||||
if (err) return cb(err)
|
if (err) return cb(err)
|
||||||
nativeUnmount()
|
nativeUnmount()
|
||||||
})
|
})
|
||||||
|
Loading…
Reference in New Issue
Block a user