Fixed a couple of bugs in Download task. Removed workarounds that are no longer necessary.
This commit is contained in:
1 parent
d7149430d8
commit
7072d255c9
1 file changed
+6
-6
+6
-6
@@ -43,8 +43,8 @@ this.refreshObject = (task, methodResponse, callback) ->
|
|||||||
)
|
)
|
||||||
else if task.session.subtask.name is 'getParameterValues'
|
else if task.session.subtask.name is 'getParameterValues'
|
||||||
if methodResponse.faultcode?
|
if methodResponse.faultcode?
|
||||||
# Ignore GetParameterValues errors. A workaround for the crappy Seewon devices.
|
task.fault = methodResponse
|
||||||
methodResponse = {parameterList : {}}
|
return callback(null, STATUS_FAULT)
|
||||||
|
|
||||||
this.getParameterValues(task.session.subtask, methodResponse, (err, status, cwmpResponse, deviceUpdates) ->
|
this.getParameterValues(task.session.subtask, methodResponse, (err, status, cwmpResponse, deviceUpdates) ->
|
||||||
callback(err, status, cwmpResponse, deviceUpdates)
|
callback(err, status, cwmpResponse, deviceUpdates)
|
||||||
@@ -247,8 +247,8 @@ this.addObject = (task, methodResponse, callback) ->
|
|||||||
task.session.appliedParameterValues.push([p1[0], v, t])
|
task.session.appliedParameterValues.push([p1[0], v, t])
|
||||||
|
|
||||||
if methodResponse.faultcode?
|
if methodResponse.faultcode?
|
||||||
# Ignore GetParameterValues errors. A workaround for the crappy Seewon devices.
|
task.fault = methodResponse
|
||||||
methodResponse = {parameterList : {}}
|
return callback(null, STATUS_FAULT)
|
||||||
|
|
||||||
if status & STATUS_COMPLETED and task.session.appliedParameterValues.length > 0
|
if status & STATUS_COMPLETED and task.session.appliedParameterValues.length > 0
|
||||||
task.session.subtask = {name : 'setParameterValues', parameterValues : task.session.appliedParameterValues}
|
task.session.subtask = {name : 'setParameterValues', parameterValues : task.session.appliedParameterValues}
|
||||||
@@ -321,9 +321,9 @@ this.download = (task, methodResponse, callback) ->
|
|||||||
|
|
||||||
methodRequest = {
|
methodRequest = {
|
||||||
type : 'Download',
|
type : 'Download',
|
||||||
fileType : file.metadata?.FileType ? '1 Firmware Upgrade Image',
|
fileType : file.metadata.fileType,
|
||||||
fileSize : file.length,
|
fileSize : file.length,
|
||||||
url : "http://#{config.FILES_IP}:#{config.FILES_PORT}/#{file.filename}",
|
url : "http://#{config.FILES_IP}:#{config.FILES_PORT}/#{encodeURIComponent(file.filename)}",
|
||||||
successUrl : task.successUrl,
|
successUrl : task.successUrl,
|
||||||
failureUrl : task.failureUrl
|
failureUrl : task.failureUrl
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user