moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix loading order on fb info

This commit is contained in:
Bryan Ashby 2017-02-18 23:05:40 -07:00
parent 6717cd5179
commit 5c58fd2cfa
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/oputil/oputil_file_base.js
View File

@ -139,23 +139,23 @@ function dumpFileInfo(shaOrFileId, cb) {
async.waterfall(
[
function getBySha(callback) {
FileEntry.findFileBySha(shaOrFileId, (err, fileEntry) => {
return callback(null, fileEntry);
function getByFileId(callback) {
const fileId = parseInt(shaOrFileId);
if(!/^[0-9]+$/.test(shaOrFileId) || isNaN(fileId)) {
return callback(null, null);
}
const fileEntry = new FileEntry();
fileEntry.load(fileId, () => {
return callback(null, fileEntry); // try sha
});
},
function getByFileId(fileEntry, callback) {
function getBySha(fileEntry, callback) {
if(fileEntry) {
return callback(null, fileEntry); // already got it by sha
}
const fileId = parseInt(shaOrFileId);
if(isNaN(fileId)) {
return callback(Errors.DoesNotExist('Not found'));
}
fileEntry = new FileEntry();
fileEntry.load(shaOrFileId, err => {
FileEntry.findFileBySha(shaOrFileId, (err, fileEntry) => {
return callback(err, fileEntry);
});
},