From 5c58fd2cfabb33aa8710cbc09d08d96539de5fb2 Mon Sep 17 00:00:00 2001
From: Bryan Ashby <bryan@l33t.codes>
Date: Sat, 18 Feb 2017 23:05:40 -0700
Subject: [PATCH] Fix loading order on fb info

---
 core/oputil/oputil_file_base.js | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/core/oputil/oputil_file_base.js b/core/oputil/oputil_file_base.js
index da837180..6a2a18cb 100644
--- a/core/oputil/oputil_file_base.js
+++ b/core/oputil/oputil_file_base.js
@@ -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);
 				});
 			},