@ -2,8 +2,9 @@ require.config({ paths: { 'json.sortify': '/bower_components/json.sortify/dist/J
define ( [ define ( [
'/common/cryptpad-common.js' ,
'/common/cryptpad-common.js' ,
'/common/cryptget.js' ,
'/common/cryptget.js' ,
'/common/fileObject.js' ,
'json.sortify'
'json.sortify'
] , function ( Cryptpad , Crypt , ) { ] , function ( Cryptpad , Crypt , FO, Sortify) {
var exp = { } ;
var exp = { } ;
var getType = function ( el ) {
var getType = function ( el ) {
@ -17,6 +18,7 @@ define([
var nkey = key ;
var nkey = key ;
while ( typeof ( obj [ nkey ] ) !== "undefined" ) {
while ( typeof ( obj [ nkey ] ) !== "undefined" ) {
nkey = key + '_' + i ;
nkey = key + '_' + i ;
i ++ ;
}
}
return nkey ;
return nkey ;
} ;
} ;
@ -39,7 +41,8 @@ define([
} ;
} ;
// Merge obj2 into obj1
// Merge obj2 into obj1
// If keepOld is true, obj1 values are kept in case of conflict in the ROOT object
// If keepOld is true, obj1 values are kept in case of conflicti
// Not used ATM
var merge = function ( obj1 , obj2 , keepOld ) {
var merge = function ( obj1 , obj2 , keepOld ) {
if ( typeof ( obj1 ) !== "object" || typeof ( obj2 ) !== "object" ) { return ; } ;
if ( typeof ( obj1 ) !== "object" || typeof ( obj2 ) !== "object" ) { return ; } ;
Object . keys ( obj2 ) . forEach ( function ( k ) {
Object . keys ( obj2 ) . forEach ( function ( k ) {
@ -57,40 +60,116 @@ define([
}
}
// Else, they're both maps or both arrays
// Else, they're both maps or both arrays
if ( getType ( obj1 [ k ] ) === "array" && getType ( obj2 [ k ] ) === "array" ) {
if ( getType ( obj1 [ k ] ) === "array" && getType ( obj2 [ k ] ) === "array" ) {
// CryptPad_RECENTPADS
var c = obj1 [ k ] . concat ( obj2 [ k ] ) ;
if ( k === 'CryptPad_RECENTPADS' ) {
obj1 [ k ] = deduplicate ( c ) ;
var old = obj1 [ k ] ;
return ;
obj2 [ k ] . forEach ( function ( pad ) {
if ( ! old . some ( function ( op ) {
// TODO read-only links
return op . href === pad . href ;
} ) ) {
old . push ( pad ) ;
}
}
merge ( obj1 [ k ] , obj2 [ k ] , keepOld ) ;
} ) ;
} ) ;
} ;
var createFromPath = function ( proxy , oldFo , path , href ) {
var root = proxy . drive ;
var error = function ( msg ) {
console . error ( msg || "Unable to find that path" , path ) ;
} ;
if ( path [ 0 ] === FO . TRASH && path . length === 4 ) {
href = oldFo . getTrashElementData ( path ) ;
path . pop ( ) ;
}
var p , next , nextRoot ;
path . forEach ( function ( p , i ) {
if ( ! root ) { return ; }
if ( typeof ( p ) === "string" ) {
if ( getType ( root ) !== "object" ) { root = undefined ; error ( ) ; return ; }
if ( i === path . length - 1 ) {
root [ findAvailableKey ( root , p ) ] = href ;
return ;
return ;
}
}
var c = obj1 [ k ] . concat ( obj2 [ k ] ) ;
next = getType ( path [ i + 1 ] ) ;
obj1 [ k ] = deduplicate ( c ) ;
nextRoot = getType ( root [ p ] ) ;
if ( nextRoot !== "undefined" ) {
if ( next === "string" && nextRoot === "object" || next === "number" && nextRoot === "array" ) {
root = root [ p ] ;
return ;
return ;
}
}
merge ( obj1 [ k ] , obj2 [ k ] ) ;
p = findAvailableKey ( root , p ) ;
}
if ( next === "number" ) {
root [ p ] = [ ] ;
root = root [ p ] ;
return ;
}
root [ p ] = { } ;
root = root [ p ] ;
return ;
}
// Path contains a non-string element: it's an array index
if ( typeof ( p ) !== "number" ) { root = undefined ; error ( ) ; return ; }
if ( getType ( root ) !== "array" ) { root = undefined ; error ( ) ; return ; }
if ( i === path . length - 1 ) {
if ( root . indexOf ( href ) === - 1 ) { root . push ( href ) ; }
return ;
}
next = getType ( path [ i + 1 ] ) ;
if ( next === "number" ) {
error ( '2 consecutives arrays in the user object' ) ;
root = undefined ;
//root.push([]);
//root = root[root.length - 1];
return ;
}
root . push ( { } ) ;
root = root [ root . length - 1 ] ;
return ;
} ) ;
} ) ;
} ;
} ;
var mergeAnonDrive = exp . anonDriveIntoUser = function ( proxy , cb ) {
var mergeAnonDrive = exp . anonDriveIntoUser = function ( proxy , cb ) {
// Make sure we have an FS_hash and we don't use it, otherwise just stop the migration and cb
// Make sure we have an FS_hash and we don't use it, otherwise just stop the migration and cb
if ( ! localStorage . FS _hash || ! Cryptpad . isLoggedIn ( ) ) {
if ( ! localStorage . FS _hash || ! Cryptpad . isLoggedIn ( ) ) {
delete sessionStorage . migrateAnonDrive ;
if ( typeof ( cb ) === "function" ) { cb ( ) ; }
if ( typeof ( cb ) === "function" ) { cb ( ) ; }
}
}
// Get the content of FS_hash and then merge the objects, remove the migration key and cb
// Get the content of FS_hash and then merge the objects, remove the migration key and cb
var todo = function ( err , doc ) {
var todo = function ( err , doc ) {
if ( err ) { logError ( "Cannot migrate recent pads" , err ) ; return ; }
if ( err ) { console. e rror( "Cannot migrate recent pads" , err ) ; return ; }
var parsed ;
var parsed ;
try { parsed = JSON . parse ( doc ) ; } catch ( e ) { logError ( "Cannot parsed recent pads" , e ) ; }
try { parsed = JSON . parse ( doc ) ; } catch ( e ) { logError ( "Cannot parsed recent pads" , e ) ; }
if ( parsed ) {
if ( parsed ) {
merge ( proxy , parsed , true ) ;
//merge(proxy, parsed, true);
var oldFo = FO . init ( parsed . drive , {
Cryptpad : Cryptpad
} ) ;
var newData = Cryptpad . getStore ( ) . getProxy ( ) ;
var newFo = newData . fo ;
var newRecentPads = proxy . drive [ Cryptpad . storageKey ] ;
var newFiles = newFo . getFilesDataFiles ( ) ;
var oldFiles = oldFo . getFilesDataFiles ( ) ;
oldFiles . forEach ( function ( href ) {
// Do not migrate a pad if we already have it, it would create a duplicate in the drive
if ( newFiles . indexOf ( href ) !== - 1 ) { return ; }
// If we have a stronger version, do not add the current href
if ( Cryptpad . findStronger ( href , newRecentPads ) ) { return ; }
// If we have a weaker version, replace the href by the new one
// NOTE: if that weaker version is in the trash, the strong one will be put in unsorted
var weaker = Cryptpad . findWeaker ( href , newRecentPads ) ;
if ( weaker ) {
newFo . replaceHref ( weaker , href ) ;
return ;
}
// Here it means we have a new href, so we should add it to the drive at its old location
var paths = oldFo . findFile ( href ) ;
if ( paths . length === 0 ) { return ; }
createFromPath ( proxy , oldFo , paths [ 0 ] , href ) ;
// Also, push the file data in our array
var data = oldFo . getFileData ( href ) ;
if ( data ) {
newRecentPads . push ( data ) ;
}
} ) ;
}
}
if ( typeof ( cb ) === "function" ) { cb ( ) ; }
if ( typeof ( cb ) === "function" ) { cb ( ) ; }
} ;
} ;
yflory
8 years ago