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

reworked how .location is handled...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-05-07 02:02:42 +03:00
parent 14d1b9410e
commit be349ea90e
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ui (gen4)/features/filesystem.js
View File

@ -50,9 +50,6 @@ if(typeof(process) != 'undefined'){
// NOTE: this will also manage .location.from // NOTE: this will also manage .location.from
//
// XXX revise base path mechanics...
// .loaded_paths
var FileSystemLoaderActions = actions.Actions({ var FileSystemLoaderActions = actions.Actions({
config: { config: {
'index-dir': '.ImageGrid', 'index-dir': '.ImageGrid',
@ -69,18 +66,11 @@ var FileSystemLoaderActions = actions.Actions({
clone: [function(full){ clone: [function(full){
return function(res){ return function(res){
if(this.location){ if(this.location){
res.location.path = this.location.path res.__location = JSON.parse(JSON.stringify(this.__location))
res.location.method = this.location.method
}
if(this.loaded_paths){
res.loaded_paths = JSON.parse(JSON.stringify(this.loaded_paths))
} }
} }
}], }],
loaded_paths: null,
// XXX should this be more general??? // XXX should this be more general???
reloadState: ['File/Reload viewer state...', reloadState: ['File/Reload viewer state...',
function(){ function(){
@ -96,12 +86,14 @@ var FileSystemLoaderActions = actions.Actions({
checkPath: ['- File/', checkPath: ['- File/',
function(path){ return fse.existsSync(path) }], function(path){ return fse.existsSync(path) }],
//
// This maintains:
// .location.loaded - list of loaded URLs...
//
// NOTE: when passed no path this will not do anything... // NOTE: when passed no path this will not do anything...
// NOTE: this will add a .from field to .location, this will indicate // NOTE: this will add a .from field to .location, this will indicate
// the date starting from which saves are loaded. // the date starting from which saves are loaded.
// //
// XXX how should .location be handled when merging indexes or
// viewing multiple/clustered indexes???
// XXX add a symmetric equivalent to .prepareIndexForWrite(..) so as // XXX add a symmetric equivalent to .prepareIndexForWrite(..) so as
// to enable features to load their data... // to enable features to load their data...
// XXX should this return a promise??? ...a clean promise??? // XXX should this return a promise??? ...a clean promise???
@ -216,9 +208,9 @@ var FileSystemLoaderActions = actions.Actions({
that.load(index) that.load(index)
that.loaded_paths = loaded
that.__location = { that.__location = {
path: loaded.length == 1 ? loaded[0] : path, path: path,
loaded: loaded,
method: 'loadIndex', method: 'loadIndex',
} }
@ -389,7 +381,6 @@ var FileSystemLoaderActions = actions.Actions({
clear: [function(){ clear: [function(){
delete this.__location delete this.__location
delete this.loaded_paths
}], }],
}) })
@ -1240,7 +1231,15 @@ var FileSystemWriterActions = actions.Actions({
saveIndex: ['- File/', saveIndex: ['- File/',
function(path, logger){ function(path, logger){
var that = this var that = this
path = path || this.location.path
path = path || this.location.loaded
path = path.length == 1 ? path[0] : path
// XXX
if(path instanceof Array){
console.error('saving to merged indexes not yet supported...')
return
}
// resolve relative paths... // resolve relative paths...
if(/^(\.\.?[\\\/]|[^\\\/])/.test(path) if(/^(\.\.?[\\\/]|[^\\\/])/.test(path)