1
0
Fork 0
mirror of https://github.com/openstf/stf synced 2025-10-04 18:29:17 +02:00

add filesystem support(without frontend)

This commit is contained in:
hzsunshx 2015-09-17 16:52:17 +08:00
parent 7188ca8f2a
commit b258837757
6 changed files with 174 additions and 0 deletions

View file

@ -38,6 +38,7 @@ module.exports = function(options) {
.dependency(require('./plugins/ringer')) .dependency(require('./plugins/ringer'))
.dependency(require('./plugins/wifi')) .dependency(require('./plugins/wifi'))
.dependency(require('./plugins/sd')) .dependency(require('./plugins/sd'))
.dependency(require('./plugins/filesystem'))
.define(function(options, heartbeat, solo) { .define(function(options, heartbeat, solo) {
if (process.send) { if (process.send) {
// Only if we have a parent process // Only if we have a parent process

View file

@ -0,0 +1,132 @@
var util = require('util')
var syrup = require('stf-syrup')
var adbkit = require('adbkit')
var path = require('path')
var logger = require('../../../util/logger')
var wire = require('../../../wire')
var wireutil = require('../../../wire/util')
module.exports = syrup.serial()
.dependency(require('../support/adb'))
.dependency(require('../support/router'))
.dependency(require('../support/push'))
.dependency(require('../support/storage'))
.dependency(require('../resources/minicap'))
.dependency(require('./util/display'))
.define(function(options, adb, router, push, storage, minicap, display) {
var log = logger.createLogger('device:plugins:filesystem')
var plugin = Object.create(null)
plugin.retrive = function(file) {
log.info('Retriving file %s', file)
return adb.pull(options.serial, file)
.then(adbkit.util.readAll)
.then(function(){
return adb.stat(options.serial, file)
})
.then(function(stats){
if (stats.size == 0){
log.info(util.format("File %s is empty", file))
}
return adb.pull(options.serial, file)
.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: 'text/plain', // FIXME(ssx): need to detect file type
knownLength: stats.size
})
})
})
.finally(function(){
log.info(util.format("file %s transfer finished", file))
})
}
router.on(wire.FileSystemGetMessage, function(channel, message) {
var reply = wireutil.reply(options.serial)
plugin.retrive(message.file)
.then(function(file){
push.send([
channel,
reply.okay('success', file)
])
})
.catch(function(err){
log.error('File retrive %s failed\n%s', message.file, err.stack)
push.send([
channel,
reply.fail(err.message)
])
})
})
return plugin;
// function projectionFormat() {
// return util.format(
// '%dx%d@%dx%d/%d'
// , display.properties.width
// , display.properties.height
// , display.properties.width
// , display.properties.height
// , display.properties.rotation
// )
// }
// plugin.capture = function() {
// log.info('Capturing screenshot')
// var file = util.format('/data/local/tmp/minicap_%d.jpg', Date.now())
// return minicap.run(util.format(
// '-P %s -s >%s', projectionFormat(), file))
// .then(adbkit.util.readAll)
// .then(function() {
// return adb.stat(options.serial, file)
// })
// .then(function(stats) {
// if (stats.size === 0) {
// throw new Error('Empty screenshot; possibly secure screen?')
// }
// return adb.pull(options.serial, file)
// .then(function(transfer) {
// return storage.store('image', transfer, {
// filename: util.format('%s.jpg', options.serial)
// , contentType: 'image/jpeg'
// , knownLength: stats.size
// })
// })
// })
// .finally(function() {
// return adb.shell(options.serial, ['rm', '-f', file])
// .then(adbkit.util.readAll)
// })
// }
// router.on(wire.ScreenCaptureMessage, function(channel) {
// var reply = wireutil.reply(options.serial)
// plugin.capture()
// .then(function(file) {
// push.send([
// channel
// , reply.okay('success', file)
// ])
// })
// .catch(function(err) {
// log.error('Screen capture failed', err.stack)
// push.send([
// channel
// , reply.fail(err.message)
// ])
// })
// })
// return plugin
})

View file

@ -138,6 +138,10 @@ module.exports = function(options) {
app.get('/s/blob/:id/:name', function(req, res) { app.get('/s/blob/:id/:name', function(req, res) {
var file = storage.retrieve(req.params.id) var file = storage.retrieve(req.params.id)
if (file) { if (file) {
if (typeof req.query.download !== 'undefined') {
res.set('Content-Disposition',
'attachment; filename="' + path.basename(file.name) + '"')
}
res.set('Content-Type', file.type) res.set('Content-Type', file.type)
res.sendFile(file.path) res.sendFile(file.path)
} }

View file

@ -826,6 +826,16 @@ module.exports = function(options) {
) )
]) ])
}) })
.on('fs.retrive', function(channel, responseChannel, data) {
joinChannel(responseChannel)
push.send([
channel
, wireutil.transaction(
responseChannel
, new wire.FileSystemGetMessage(data)
)
])
})
}) })
.finally(function() { .finally(function() {
// Clean up all listeners and subscriptions // Clean up all listeners and subscriptions

View file

@ -72,6 +72,27 @@ enum MessageType {
AccountRemoveMessage = 55; AccountRemoveMessage = 55;
SdStatusMessage = 61; SdStatusMessage = 61;
ReverseForwardsEvent = 72; ReverseForwardsEvent = 72;
FileSystemListEvent = 80;
FileSystemListMessage = 81;
FileSystemGetMessage = 82;
}
message FileSystemListEvent {
required string serial = 1;
required string dir = 2;
}
message FileSystemListMessage {
required string dir = 1;
repeated FileSystemProperty files = 2;
}
message FileSystemProperty {
required string name = 1;
required string mod = 2;
}
message FileSystemGetMessage {
required string file = 1;
} }
message Envelope { message Envelope {

View file

@ -225,6 +225,12 @@ module.exports = function ControlServiceFactory(
return sendTwoWay('screen.capture') return sendTwoWay('screen.capture')
} }
this.fsretrive = function(file){
return sendTwoWay('fs.retrive', {
file: file,
})
}
this.checkAccount = function(type, account) { this.checkAccount = function(type, account) {
return sendTwoWay('account.check', { return sendTwoWay('account.check', {
type: type type: type