Skip to content

O
officejs
Commit 6ac4b305 authored by François Billioud's avatar François Billioud
Browse files
Options

fix the loader and add indexed storage and multiple storage

parent 5fccb361
Hide whitespace changes
Inline Side-by-side
Showing with 136 additions and 57 deletions
UNGProject/unhosted/jio.js
View file @ 6ac4b305
...@@ -13,11 +13,10 @@ ...@@ -13,11 +13,10 @@
"unhosted/base64.js" "unhosted/base64.js"
],[//element to check before being ready ],[//element to check before being ready
$ $
]); ], // function to execute then
//wait until dependencies are ready
(function waitUntilLoaded() {!ready() ? setTimeout(waitUntilLoaded,50) : script();})() function() {
function script() {
/** /**
* JIO main object. Contains all IO methods * JIO main object. Contains all IO methods
...@@ -481,7 +480,7 @@ ...@@ -481,7 +480,7 @@
oneOrEach(file,deleteFileData); oneOrEach(file,deleteFileData);
indexedStorage.save(); indexedStorage.save();
} }
this.storage.deleteDocument(file, newOption); return this.storage.deleteDocument(file, newOption);
function deleteFileData(fileName) { function deleteFileData(fileName) {
delete this.getIndex()[fileName]; delete this.getIndex()[fileName];
...@@ -509,6 +508,39 @@ ...@@ -509,6 +508,39 @@
} }
/***************************************************************
*********************** CryptedStorage *************************/
/**
* Class CryptedStorage
* @class provides usual API to encrypte data storing documents
* @param data : object containing every element needed to build the storage
* "storage" : the storage to encrypt
* "password" : the key to encrypt/decrypt data
* "method" : (optional) the algorythm to use - Only sjcl available for the moment
* @param applicant : object containing inforamtion about the person/application needing this JIO object
*/
JIO.ReplicateStorage = function(data, applicant) {
this.storage = createStorage(data.storage, applicant);
this.password = data.password;
}
JIO.ReplicateStorage.prototype = {
userNameAvailable: function(name, option) {return this.storage.userNameAvailable.apply(this.storage,arguments)},
loadDocument: function(fileName, option) {
var cryptedStorage = this;
var newOption = copy(option);
newOption.success = function(data) {
if(option.success) {option.success(sjcl.decrypt(data,cryptedStorage.password))}//case asynchronous
}
var data = this.storage.loadDocument(fileName, newOption);
return data ? sjcl.decrypt(data,cryptedStorage.password) : data //case synchronous
},
saveDocument: function(data, fileName, option) {
return this.storage.saveDocument(sjcl.encrypt(data,this.password), fileName, option)
},
deleteDocument: function(file, option) {return this.storage.deleteDocument.apply(this.storage,arguments)},
getDocumentList: function(option) {return this.storage.getDocumentList.apply(this.storage,arguments)}
}
/*************************************************************** /***************************************************************
*********************** ReplicateStorage *************************/ *********************** ReplicateStorage *************************/
/** /**
...@@ -627,46 +659,88 @@ ...@@ -627,46 +659,88 @@
* @param applicant : object containing inforamtion about the person/application needing this JIO object * @param applicant : object containing inforamtion about the person/application needing this JIO object
*/ */
JIO.MultipleStorage = function(data, applicant) { JIO.MultipleStorage = function(data, applicant) {
this.storageList = {}; this.storageList = {};//contains the different storages
this.documentList = {};//contains the document list of each storage
for(var storage in data.storageList) {//create each storage from the list for(var storage in data.storageList) {//create each storage from the list
this.storageList[storage]=createStorage(data.storageList[storage], applicant); this.storageList[storage]=createStorage(data.storageList[storage], applicant);
} }
} }
JIO.MultipleStorage.prototype = { JIO.MultipleStorage.prototype = {
userNameAvailable: function(userName, option) { userNameAvailable: function(userName, option) {
if(option.location) {//TODO : think about writing location as a string "a/b/c" in case of spate of multipleStorages var path = userName.split("/");
this.storageList[option.location].userNameAvailable(userName,option) if(path.length>1) {
var storage = path.shift();
var name = path.join("/");
this.storageList[storage].userNameAvailable(name,option)
} else { } else {
//TODO //TODO
} }
},//TODO /return this.storage.userNameAvailable.apply(this.storage,arguments)}, },//TODO /return this.storage.userNameAvailable.apply(this.storage,arguments)},
loadDocument: function(fileName, option) { loadDocument: function(fileName, option) {
if(option.location) { var path = fileName.split("/");
this.storageList[option.location].loadDocument(fileName,option) if(path.length>1) {
var storage = path.shift();
var name = path.join("/");
this.storageList[storage].loadDocument(name,option)
} else { } else {
//TODO //TODO : handle name conflicts
var multipleStorage = this;
$.each(this.storageList, function(storage){
if(multipleStorage.documentList[storage][fileName]) {
multipleStorage.storageList[storage].loadDocument(fileName,option)
}
});
} }
}, },
saveDocument: function(data, fileName, option) { saveDocument: function(data, fileName, option) {
if(option.location) { var path = fileName.split("/");
this.storageList[option.location].saveDocument(data, fileName, option) if(path.length>1) {
var storage = path.shift();
var name = path.join("/");
this.storageList[storage].saveDocument(data, name, option)
} else { } else {
//TODO //TODO : decide how to choose between storages
} }
}, },
deleteDocument: function(fileName, option) { deleteDocument: function(fileName, option) {
if(option.location) { var path = fileName.split("/");
this.storageList[option.location].deleteDocument(fileName, option) if(path.length>1) {
var storage = path.shift();
var name = path.join("/");
this.storageList[storage].deleteDocument(name, option)
} else { } else {
//TODO var multipleStorage = this;
$.each(this.storageList, function(storage){
if(multipleStorage.documentList[storage][fileName]) {
multipleStorage.storageList[storage].deleteDocument(fileName,option);
delete multipleStorage.documentList[storage][fileName]
}
});
} }
}, },
getDocumentList: function(option) { getDocumentList: function(option) {
if(option.location) { if(option.location) {
this.storageList[option.location].getDocumentList(option) this.storageList[option.location].getDocumentList(option)
} else { } else {
//TODO var finalList = {};
var multipleStorage = this;
$.each(this.storageList, function(storage){
var documentList = multipleStorage.documentList[storage];
$.each(documentList,function(fileName) {
finalList[storage+"/"+fileName]= copy(documentList[fileName]);
finalList[storage+"/"+fileName].fileName = storage+"/"+fileName;
})
});
} }
},
updateDocumentList: function() {
for(var storage in this.storageList) { this.documentList[storage] = this.storageList[storage].getDocumentList() }
},
analysePath: function(path) {
var storage = path.shift();
var address = path.join("/");
return {storage: storage, address: address}
} }
} }
...@@ -704,6 +778,7 @@ ...@@ -704,6 +778,7 @@
case "index":return new JIO.IndexedStorage(data, applicant);break; case "index":return new JIO.IndexedStorage(data, applicant);break;
case "multiple":return new JIO.MultipleStorage(data, applicant);break; case "multiple":return new JIO.MultipleStorage(data, applicant);break;
case "replicate":return new JIO.ReplicateStorage(data, applicant);break; case "replicate":return new JIO.ReplicateStorage(data, applicant);break;
case "encrypte":return new JIO.CryptedStorage(data,applicant);break;
//etc //etc
default:var waitedNode = null;//create a custom storage from a js file default:var waitedNode = null;//create a custom storage from a js file
$.ajax({ $.ajax({
...@@ -719,17 +794,9 @@ ...@@ -719,17 +794,9 @@
} }
} }
/**
* return a shallow copy of the object parameter
* @param object : the object to copy
* @return a shallow copy of the object
*/
function copy(object) {
$.extend({}, object);
}
/** /**
* delegate a function to a non-object element, or to each element of an array of non-object elements * delegate a function to a non-object element, or to each element of an array of non-object elements
* this function is used to delete a file or a list of files for example
* @param element : a non-object element, or an array of non-object elements * @param element : a non-object element, or an array of non-object elements
* @param f : function to apply * @param f : function to apply
*/ */
...@@ -738,40 +805,52 @@ ...@@ -738,40 +805,52 @@
} }
/** /**
* include js files * return a shallow copy of the object parameter
* @param url : path or array of paths of the js file(s) * @param object : the object to copy
* @param flag : (optional) array of elements allowing to know if dependencies are ready * @return a shallow copy of the object
* @return a ready function which returns true only if the dependencies are ready
* @example : includeJS("jquery.js",[$]);
*/ */
function includeJS(url,flag) { function copy(object) {
oneOrEach(url,includeElement); $.extend({}, object);
return function() { }
return checkArray(flag.slice());
}
function includeElement(element) {//include a js file window.JIO = JIO;//the name to use for the framework. Ex : JIO.initialize(...), JIO.loadDocument...
var head = window.document.getElementsByTagName('head')[0]; });
var script = window.document.createElement('script');
script.setAttribute('src', url);
script.setAttribute('type', 'text/javascript'); /****************************************************************
head.appendChild(script); *************************** Loader *****************************/
}
function checkElement(element) {//check if a script is ready /**
switch(typeof element) { * include js files
case "function" : return element.call(this);break; * @param url : path or array of paths of the js file(s)
case "undefined" : return false;break; * @param flag : (optional) array of elements allowing to know if dependencies are ready
case "object" : return true; * @param instruction : (optional) instruction to execute when dependencies are loaded
} * @return a ready function which returns true only if the dependencies are ready
} * @example : includeJS("jquery.js",[$]);
function checkArray(array) {//recursive function to check if elements are ready */
if(!array) return true; function includeJS(url,flag, instruction) {
var head = array.pop(); typeof url != "object" ? includeElement(url) : onEach(url);
return checkElement(head) && checkArray(array); var ready = function() {
} return oneOrEach(flag.slice(),function(element){return typeof element != "undefined"});
}
if(instruction) {
(function waitUntilLoaded() {!ready() ? setTimeout(waitUntilLoaded,50) : instruction();})()
}
return ready;
function includeElement(element) {//include a js file
var head = window.document.getElementsByTagName('head')[0];
var script = window.document.createElement('script');
script.setAttribute('src', url);
script.setAttribute('type', 'text/javascript');
head.appendChild(script);
} }
window.JIO = JIO;//the name to use for the framework. Ex : JIO.initialize(...) function onEach(array,f) {
var head = array.pop();
if(array.length==0) {return true}
return f(head) && oneOrEach(array);
}
} }
})(); })();
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7