yetangitu/OpenSTF
1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-05 02:29:26 +02:00
Code Issues Releases Wiki Activity

Clean up the filesystem plugin a little.

Browse source
This commit is contained in:
Simo Kinnunen 2015-09-27 21:59:05 +09:00
parent 2d73310aa8
commit a779413000
2 changed files with 76 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

156
lib/units/device/plugins/filesystem.js
View file

@ -1,82 +1,74 @@
var util = require('util') var syrup = require('stf-syrup')
var path = require('path')
var syrup = require('stf-syrup')
var adbkit = require('adbkit') var logger = require('../../../util/logger')
var path = require('path') var wire = require('../../../wire')
var wireutil = require('../../../wire/util')
var logger = require('../../../util/logger')
var wire = require('../../../wire') module.exports = syrup.serial()
var wireutil = require('../../../wire/util') .dependency(require('../support/adb'))
.dependency(require('../support/router'))
module.exports = syrup.serial() .dependency(require('../support/push'))
.dependency(require('../support/adb')) .dependency(require('../support/storage'))
.dependency(require('../support/router')) .define(function(options, adb, router, push, storage) {
.dependency(require('../support/push')) var log = logger.createLogger('device:plugins:filesystem')
.dependency(require('../support/storage')) var plugin = Object.create(null)
.dependency(require('../resources/minicap'))
.dependency(require('./util/display')) plugin.retrieve = function(file) {
.define(function(options, adb, router, push, storage, minicap, display) { log.info('Retrieving file "%s"', file)
var log = logger.createLogger('device:plugins:filesystem')
var plugin = Object.create(null) return adb.stat(options.serial, file)
.then(function(stats) {
plugin.retrieve = function(file) { return adb.pull(options.serial, file)
log.info('Retriving file %s', file) .then(function(transfer) {
// We may have add new storage plugins for various file types
return adb.stat(options.serial, file) // in the future, and add proper detection for the mimetype.
.then(function(stats){ // But for now, let's just use application/octet-stream for
if (stats.size == 0){ // everything like it's 2001.
log.info(util.format("File %s is empty", file)) return storage.store('blob', transfer, {
} filename: path.basename(file)
, contentType: 'application/octet-stream'
return adb.pull(options.serial, file) , knownLength: stats.size
.then(function(transfer){ })
// if this is a new store type, somethings need add to units/storage/plugins/ })
return storage.store('blob', transfer, { })
filename: path.basename(file), }
contentType: 'application/octet-stream', // FIXME(ssx): need to detect file type
knownLength: stats.size router.on(wire.FileSystemGetMessage, function(channel, message) {
}) var reply = wireutil.reply(options.serial)
}) plugin.retrieve(message.file)
}) .then(function(file) {
.finally(function(){ push.send([
log.info(util.format("File %s transfer finished", file)) channel
}) , reply.okay('success', file)
} ])
})
router.on(wire.FileSystemGetMessage, function(channel, message) { .catch(function(err) {
var reply = wireutil.reply(options.serial) log.warn('Unable to retrieve "%s"', message.file, err.stack)
plugin.retrieve(message.file) push.send([
.then(function(file){ channel
push.send([ , reply.fail(err.message)
channel, ])
reply.okay('success', file) })
]) })
})
.catch(function(err){ router.on(wire.FileSystemListMessage, function(channel, message) {
log.error('File retrieve %s failed\n%s', message.file, err.stack) var reply = wireutil.reply(options.serial)
push.send([ adb.readdir(options.serial, message.dir)
channel, .then(function(files) {
reply.fail(err.message) push.send([
]) channel
}) , reply.okay('success', files)
}) ])
})
router.on(wire.FileSystemListMessage, function(channel, message){ .catch(function(err) {
var reply = wireutil.reply(options.serial) log.warn('Unable to list directory "%s"', message.dir, err.stack)
adb.readdir(options.serial, message.dir) push.send([
.then(function(files){ channel
push.send([ , reply.fail(err.message)
channel, ])
reply.okay('success', files) })
]) })
})
.catch(function(err){ return plugin
log.error('Dir list %s failed\n%s', message.dir, err.stack) })
push.send([
channel,
reply.fail(err.message)
])
})
})
return plugin;
})

6
res/app/control-panes/filesystem/fs.jade
View file

@ -20,11 +20,9 @@
i.fa.fa-file-o(ng-hide='f.mode|isdir') i.fa.fa-file-o(ng-hide='f.mode|isdir')
td td
button.btn.btn-sm.btn-primary-outline( button.btn.btn-sm.btn-primary-outline(
ng-click='dirEnter(f.name)', ng-show='f.mode|isdir') ng-click='dirEnter(f.name)', ng-show='f.mode|isdir') {{f.name}}
{{f.name}}
button.btn.btn-sm.btn-primary-outline( button.btn.btn-sm.btn-primary-outline(
ng-click='getFile(f.name)', ng-hide='f.mode|isdir') ng-click='getFile(f.name)', ng-hide='f.mode|isdir') {{f.name}}
{{f.name}}
td td
i {{f.mode|mode2unix}} i {{f.mode|mode2unix}}
td {{f.size}} td {{f.size}}