flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-11-04 05:10:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

file API reporting, done...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-06-06 23:26:45 +04:00
parent cd7128279a
commit 2743c55c04
3 changed files with 33 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ui/data.js
View File

@ -1264,10 +1264,16 @@ function loadLatestFile(path, dfl, pattern, diff_pattern){
function statusNotify(prefix, loader){ function statusNotify(prefix, loader){
if(loader == null){
loader = prefix
prefix = null
}
return loader return loader
.progress(function(){ .progress(function(){
var args = Array.apply(null, arguments) var args = Array.apply(null, arguments)
args.splice(0, 0, prefix) if(prefix != null && prefix != ''){
args.splice(0, 0, prefix)
}
if(args.indexOf('Error') >= 0){ if(args.indexOf('Error') >= 0){
args.pop() args.pop()
return showErrorStatus(args.join(': ')) return showErrorStatus(args.join(': '))
@ -1422,7 +1428,10 @@ function saveFileMarks(name){
// XXX add support for explicit filenames... // XXX add support for explicit filenames...
function loadFileState(path){ function loadFileState(path, prefix){
prefix = prefix == null ? 'Data' : prefix
prefix = prefix === false ? null : prefix
// XXX explicit data file path... // XXX explicit data file path...
if(/\.json$/i.test(path)){ if(/\.json$/i.test(path)){
// XXX at this // XXX at this
@ -1435,7 +1444,7 @@ function loadFileState(path){
var res = $.Deferred() var res = $.Deferred()
bubbleProgress('Data', bubbleProgress(prefix,
loadLatestFile(path, loadLatestFile(path,
DATA_FILE_DEFAULT, DATA_FILE_DEFAULT,
DATA_FILE_PATTERN), res, true) DATA_FILE_PATTERN), res, true)
@ -1454,19 +1463,21 @@ function loadFileState(path){
// version 2.0 // version 2.0
} else if(json.version == '2.0') { } else if(json.version == '2.0') {
DATA = json DATA = json
bubbleProgress('Data', $.when(
$.when( // XXX load config...
// XXX load config... // load images...
// load images... bubbleProgress(prefix,
loadFileImages(DATA.image_file == null ? loadFileImages(DATA.image_file == null ?
normalizePath(DATA.image_file, base) normalizePath(DATA.image_file, base)
: null), : null), res, true),
// load marks if available... // load marks if available...
loadFileMarks()), res, true) bubbleProgress(prefix,
loadFileMarks(), res, true))
.done(function(){ .done(function(){
reloadViewer() reloadViewer()
res.resolve() res.resolve()
}) })
// XXX fail???
// unknown format... // unknown format...
} else { } else {
@ -1560,15 +1571,17 @@ function loadRawDir(path){
// //
// XXX this will not load the marks file... // XXX this will not load the marks file...
// XXX make sure that save works... // XXX make sure that save works...
function loadDir(path){ function loadDir(path, prefix){
prefix = prefix == null ? 'Data' : prefix
prefix = prefix === false ? null : prefix
path = normalizePath(path) path = normalizePath(path)
var orig_path = path var orig_path = path
var data var data
var res = $.Deferred() var res = $.Deferred()
showStatus('Loading:', path) res.notify(prefix, 'Loading', path)
res.notify('load', path)
var files = listDir(path) var files = listDir(path)
@ -1582,13 +1595,13 @@ function loadDir(path){
path = path +'/'+ CACHE_DIR path = path +'/'+ CACHE_DIR
} }
bubbleProgress('Dir:', bubbleProgress(prefix,
loadFileState(path), res, true) loadFileState(path, false), res, true)
.done(function(){ .done(function(){
res.resolve() res.resolve()
}) })
.fail(function(){ .fail(function(){
bubbleProgress('Raw dir:', loadRawDir(orig_path), res) bubbleProgress('Raw directory', loadRawDir(orig_path), res)
}) })
return res return res

2
ui/index.html
View File

@ -149,7 +149,7 @@ $(function(){
if((DATA_ATTR + '_BASE_URL') in localStorage){ if((DATA_ATTR + '_BASE_URL') in localStorage){
BASE_URL = localStorage[DATA_ATTR + '_BASE_URL'] BASE_URL = localStorage[DATA_ATTR + '_BASE_URL']
var loading = loadDir(BASE_URL) var loading = statusNotify(loadDir(BASE_URL))
} else { } else {
// everything is in localStorage... // everything is in localStorage...

2
ui/keybindings.js
View File

@ -249,7 +249,7 @@ var KEYBOARD_CONFIG = {
return return
} }
path = path.trim() path = path.trim()
loadDir(path) statusNotify(loadDir(path))
}), }),