Add tree class

This commit is contained in:
brunosimon
2016-08-11 19:21:38 +02:00
parent d2df4758df
commit 816c164c8c
10 changed files with 976 additions and 195 deletions
+16 -14
View File
@@ -9,28 +9,30 @@ application.controller(
// Every 5 seconds
$interval( function()
{
// Each version
project.each_version( function( version )
{
// Date
version.time_from_now = version.moment_date.fromNow();
} );
// // Each version
// project.each_version( function( version )
// {
// // Date
// version.time_from_now = version.moment_date.fromNow();
// } );
}, 5000 );
$scope.folder_click = function( folder )
{
folder.active = !folder.active;
console.log('folder click');
// folder.active = !folder.active;
};
$scope.file_click = function( file )
{
project.each_file( function( file )
{
file.active = false;
} );
console.log('file click');
// project.each_file( function( file )
// {
// file.active = false;
// } );
file.active = true;
$scope.file = file;
// file.active = true;
// $scope.file = file;
};
$scope.version_click = function( version )
@@ -47,7 +49,7 @@ application.controller(
{
$scope.$apply( function()
{
$scope.project = project.data;
$scope.project = project;
} );
} );
+641
View File
@@ -0,0 +1,641 @@
'use strict'
/**
* File/Folder tree
*/
class Tree
{
/**
* Create tree and add ./ folder
* @param {Object} _options
* @param {Boolean} _options.auto_wash - Should clean empty folder on removes
*/
constructor( _options = {} )
{
if( typeof _options !== 'object' )
{
console.warn( 'constructor: _options should be an object' )
return false
}
// Options
this.auto_wash = typeof _options.auto_wash === 'undefined' ? false : _options.auto_wash
// Set up
this.folders = {}
// Initial folder
this.add_folder( '.', {} )
}
/**
* Clean path
* @param {String} _path - Path to clean
* @return {String} Cleaned path
*/
clean_path( _path )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'clean_path: _path should be a string' )
return false
}
// Trim
_path = _path.trim()
// Repeating `/`
_path = _path.replace( /\/+/g, '/' )
// Ending `/`
_path = _path.replace( /\/$/, '' )
// Starting `/`
_path = _path.replace( /^\//, '' )
// Missing starting `./`
if( _path !== '.' && _path.search( './' ) !== 0 )
_path = './' + _path
return _path
}
/**
* Add a folder
* Can create nested folder in one path
* @param {String} _path - Path to the folder (start with `./`)
* @param {Object} _data - Properties to add to the folder
* @returns {Object} Created folder
*/
add_folder( _path, _data = {} )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'add_folder: _path should be a string' )
return false
}
if( typeof _data !== 'object' )
{
console.warn( 'add_folder: _data should be an object' )
return false
}
// Set up
let path = this.clean_path( _path ),
path_parts = path.split( '/' ),
folders = this.folders,
folder = null
// Each path part
for( let _part of path_parts )
{
// Already exist
if( typeof folders[ _part ] !== 'undefined' )
{
folder = folders[ _part ]
folders = folder.folders
}
// Folder doesn't exist
else
{
// Create folder
folder = {
folders: {},
files : {},
name : _part,
data : _data
}
// Save
folders[ _part ] = folder
folders = folder.folders
}
}
// Return
return folder
}
/**
* Add a file
* Will create folders if needed
* @param {String} _path - Path to the folder (start with `./`)
* @param {Object} _data - Properties to add to the file
* @returns {Object} Created file
*/
add_file( _path, _data = {} )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'add_file: _path should be a string' )
return false
}
if( typeof _data !== 'object' )
{
console.warn( 'add_file: _data should be an object' )
return false
}
// Set up
let path = this.clean_path( _path ),
path_parts = path.split( '/' ),
file_part = path_parts.pop()
// Create folder
let folder = this.add_folder( path_parts.join( '/' ) )
// Create file
let file = {
name: file_part,
data: _data
}
// Save
folder.files[ file_part ] = file
return file
}
/**
* Remove folder
* Will delete contained folders and contained files
* @param {String} _path - Folder to delete (start with `./`)
* @returns {Boolean} Folder deleted or not
*/
remove_folder( _path )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'remove_folder: _path should be a string' )
return false
}
// Set up
let path = this.clean_path( _path ),
path_parts = path.split( '/' ),
folder_part = path_parts.pop(),
folders = this.folders,
folder = null
// Each path part
for( let _part of path_parts )
{
// Found
if( typeof folders[ _part ] !== 'undefined' )
{
folder = folders[ _part ]
folders = folder.folders
}
// Not found
else
{
folder = null
folders = null
break
}
}
// Found
if( folders && folders[ folder_part ] )
{
// Recursive emptying
function empty_folder( folder )
{
// Delete folders
for( let _folder_key in folder.folders )
{
let _folder = folder.folders[ _folder_key ]
empty_folder( _folder )
delete folder.folders[ _folder_key ]
// Callback
if( typeof _folder.data.on_remove === 'function' )
{
_folder.data.on_remove.apply( this, [ _folder ] )
}
}
// Delete files
for( let _file_key in folder.files )
{
let _file = folder.files[ _file_key ]
delete folder.files[ _file_key ]
// Callback
if( typeof _file.data.on_remove === 'function' )
{
_file.data.on_remove.apply( this, [ _file ] )
}
}
}
let folder = folders[ folder_part ]
// Delete
empty_folder( folder )
delete folders[ folder_part ]
// Callback
if( typeof folder.data.on_remove === 'function' )
{
folder.data.on_remove.apply( this, [ folder ] )
}
// Auto wash
if( this.auto_wash )
this.remove_empty_folders()
return true
}
return false
}
/**
* Remove file
* Will delete contained folders and contained files
* @param {String} _path - File to delete (start with `./`)
* @returns {Boolean} File deleted or not
*/
remove_file( _path )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'remove_file: _path should be a string' )
return false
}
// Set up
let path = this.clean_path( _path ),
path_parts = path.split( '/' ),
file_part = path_parts.pop(),
folders = this.folders,
folder = null
// Each path part
for( let _part of path_parts )
{
// Found
if( typeof folders[ _part ] !== 'undefined' )
{
folder = folders[ _part ]
folders = folder.folders
}
// Not found
else
{
folder = null
folders = null
break
}
}
// Folder found
if( folders && folder )
{
let file = folder.files[ file_part ]
if( typeof file !== 'undefined' )
{
// Delete
delete folder.files[ file_part ]
// Auto wash
if( this.auto_wash )
this.remove_empty_folders()
// Callback
if( typeof file.data.on_remove === 'function' )
{
file.data.on_remove.apply( this, [ file ] )
}
return true
}
}
return false
}
/**
* Get file
* @param {String} _path - Path to file
* @returns {Object} File
*/
get_file( _path )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'get_file: _path should be a string' )
return false
}
// Set up
let path = this.clean_path( _path ),
path_parts = path.split( '/' ),
file_part = path_parts.pop(),
folders = this.folders,
folder = null
// Each path part
for( let _part of path_parts )
{
// Found
if( typeof folders[ _part ] !== 'undefined' )
{
folder = folders[ _part ]
folders = folder.folders
}
// Not found
else
{
folder = null
folders = null
break
}
}
// Folder found
if( folders && folder )
{
let file = folder.files[ file_part ]
if( typeof file !== 'undefined' )
{
return file
}
}
return false
}
/**
* Get folder
* @param {String} _path - Path to folder
* @returns {Object} Folder
*/
get_folder( _path )
{
// Errors
if( typeof _path !== 'string' )
{
console.warn( 'get_folder: _path should be a string' )
return false
}
// Set up
let path = this.clean_path( _path ),
path_parts = path.split( '/' ),
folders = this.folders,
folder = null
// Each path part
for( let _part of path_parts )
{
// Already exist
if( typeof folders[ _part ] !== 'undefined' )
{
folder = folders[ _part ]
folders = folder.folders
}
// Folder doesn't exist
else
{
return false
}
}
// Return
return folder
}
/**
* Browse every folders and remove empty ones
* @return {Number} Number of removed folders
*/
remove_empty_folders()
{
// Set up
var removed_count = 0
// Recursive remove
function can_remove_folder( folder )
{
// Each folder inside current folder
for( let _folder_key in folder.folders )
{
// Try to remove folder
let _folder = folder.folders[ _folder_key ],
can_remove = can_remove_folder( _folder )
// Remove folder
if( can_remove )
{
removed_count++
// Delete
delete folder.folders[ _folder_key ]
// Callback
if( typeof _folder.data.on_remove === 'function' )
{
_folder.data.on_remove.apply( this, [ _folder ] )
}
}
}
// Can be removed
let folder_keys = Object.keys( folder.folders ),
files_keys = Object.keys( folder.files )
if( folder_keys.length === 0 && folder_keys.length === 0 )
{
return true
}
else
{
return false
}
}
// Try from ./
can_remove_folder( this.folders[ '.' ] )
return removed_count
}
/**
* Describe the tree in ASCII (├ ─ │ └)
* @param {Boolean} _log - Directly log to console
* @param {Boolean} _colored - Colored tree (only work well in Chrome)
* @return {String} Tree
*/
describe( _log = false, _colored = false )
{
// Set up
var string_tree = '',
depth = 0,
styles = []
function add_to_string( value, type = null )
{
if( _colored )
{
string_tree += '%c'
switch( type )
{
case 'structure':
styles.push( 'color:#999;' )
break
case 'folder':
styles.push( 'color:#999;' )
break
case 'file':
styles.push( 'color:#333;font-weight:bold;' )
break
default:
styles.push( '' )
break
}
}
string_tree += value
}
// Recursive describe
function describe_folder( folder, depth, last = [] )
{
// Set up
let folder_keys = Object.keys( folder.folders ),
file_keys = Object.keys( folder.files )
// Each folders
for( let i = 0; i < folder_keys.length; i++ )
{
// Set up
let _folder_key = folder_keys[ i ],
_folder = folder.folders[ _folder_key ]
// Add to tree string
add_to_string( '\n' )
for( let j = 0; j < depth; j++ )
{
if( j === depth - 1 )
{
if( i === folder_keys.length - 1 && file_keys.length === 0 )
add_to_string( ' └', 'structure' )
else
add_to_string( ' ├', 'structure' )
}
else
{
if( last[ j ] )
add_to_string( ' ', 'structure' )
else
add_to_string( ' │', 'structure' )
}
}
add_to_string( '─', 'structure' )
add_to_string( _folder.name, 'folder' )
add_to_string( '/', 'structure' )
// Last
last.push( i === folder_keys.length - 1 && file_keys.length === 0 )
// Continue
describe_folder( _folder, depth + 1, last )
}
// Each files
for( let i = 0; i < file_keys.length; i++ )
{
// Set up
let _file_key = file_keys[ i ],
_file = folder.files[ _file_key ]
// Add to tree string
string_tree += '\n'
for( let j = 0; j < depth; j++ )
{
if( j === depth - 1 )
{
if( i === file_keys.length - 1 )
add_to_string( ' └', 'structure' )
else
add_to_string( ' ├', 'structure' )
}
else
{
if( last[ j ] )
add_to_string( ' ', 'structure' )
else
add_to_string( ' │', 'structure' )
}
}
add_to_string( '─', 'structure' )
add_to_string( _file.name, 'file' )
}
}
// Describe from ./
add_to_string( '.', 'folder' )
add_to_string( '/', 'structure' )
describe_folder( this.folders[ '.' ], depth + 1 )
// Log
if( _log )
{
console.log.apply(console, [ string_tree ].concat( styles ) )
}
return string_tree
}
}
// /**
// * Tests
// */
// let tree = new Tree( { auto_wash: false } )
// tree.add_folder( './hey/hoy', { active: false, notifs: 0 } )
// tree.add_folder( './hey/hoy/toto', { active: false, notifs: 0 } )
// tree.add_folder( './hey/hoy/tata', { active: false, notifs: 0 } )
// tree.add_file( './test-1.txt', { active: false, notifs: 0 } )
// tree.add_file( './hey/hoy/test-2.txt', { active: false, notifs: 0 } )
// tree.add_file( './hey/hoy/test-3.txt', { active: false, notifs: 0 } )
// tree.add_file( './hey/hoy/tata/test-4.txt', { active: false, notifs: 0 } )
// tree.add_file( './hey/hoy/toto/test-5.txt', { active: false, notifs: 0 } )
// tree.add_file( './hey/hoy/toto/test-6.txt', { active: false, notifs: 0, on_remove: function( file ){ console.log( 'removed file :', file ); } } )
// tree.remove_file( './hey/hoy/toto/test-6.txt' )
// tree.add_folder( './pwet', { on_remove: function( folder ){ console.log( 'removed folder :', folder ); } } )
// tree.add_folder( './pwet/uh', { on_remove: function( folder ){ console.log( 'removed folder :', folder ); } } )
// tree.remove_folder( './pwet' )
// tree.remove_file( './hey/hoy/test-2.txt' )
// tree.remove_folder( './hey' )
// tree.describe( true, true )
+50 -162
View File
@@ -5,114 +5,15 @@ application.factory(
'$timeout',
function( config, $timeout )
{
// Result
var result = {};
result.name = '';
result.files = {};
result.tree = new Tree( { auto_wash: false } );
// Callback
var update_callback = null;
function update_folders( folder )
{
function recursive_folder_report( new_folder, old_folder )
{
if( typeof old_folder !== 'undefined' && typeof old_folder.active !== 'undefined' )
new_folder.active = old_folder.active;
for( var _folder_key in new_folder.folders )
{
var _new_folder = new_folder.folders[ _folder_key ],
_old_folder = undefined;
if( old_folder )
_old_folder = old_folder.folders[ _folder_key ];
_new_folder = recursive_folder_report( _new_folder, _old_folder );
}
return new_folder;
}
folder = recursive_folder_report( folder, result.data );
result.data.folders = folder.folders;
}
function update_files( files )
{
}
function delete_file( id )
{
delete result.data.files[ id ];
}
// Result
var result = {};
result.data = null;
result.each_folder = function( folder, callback )
{
// Only callback provided
if( typeof folder === 'function' )
{
callback = folder;
folder = result.data;
}
// Apply callback
callback.apply( folder, [ folder ] );
// Each folder
for(var _folder_key in folder.folders)
{
var _folder = folder.folders[ _folder_key ];
result.each_folder( _folder, callback );
}
}
result.each_file = function( folder, callback )
{
// Only callback provided
if( typeof folder === 'function' )
{
callback = folder;
folder = result.data;
}
// Each folder
result.each_folder( folder, function( folder )
{
// Each file
for(var _file_key in folder.files)
{
var _file = folder.files[ _file_key ];
callback.apply( _file, [ _file ] );
}
} );
}
result.each_version = function( folder, callback )
{
// Only callback provided
if( typeof folder === 'function' )
{
callback = folder;
folder = result.data;
}
// Each file
result.each_file( folder, function( file )
{
// Each version
for(var _version_key in file.versions)
{
var _version = file.versions[ _version_key ];
callback.apply( _version, [ _version ] );
}
} );
}
// Update callback
result.on_update = function( callback )
{
update_callback = callback;
@@ -130,73 +31,66 @@ application.factory(
console.log('connected');
} );
socket.on( 'create_file', function( data )
{
console.log('create_file');
console.log(data);
} );
socket.on( 'update_file', function( data )
{
console.log('update_file');
console.log(data);
// console.log('update_file');
// console.log(data);
var existing_file = result.files[ data.path.full ];
// Doesn't exist yet
if( typeof existing_file === 'undefined' )
{
existing_file = Object.assign( {}, data );
existing_file.notif = 0;
result.files[ _file_key ] = existing_file;
result.tree.add_file( _file_key, existing_file )
}
existing_file.notif++;
// Apply callback
if( typeof update_callback === 'function' )
update_callback.apply( this, [ data ] );
} );
socket.on( 'delete_file', function( data )
{
console.log('delete_file');
console.log(data);
delete_file( data );
} );
socket.on( 'update_folders', function( data )
{
console.log('update_folders');
console.log(data);
update_folders( { folders: data } );
} );
// Update project event
socket.on( 'update_project', function( data )
{
console.log('update_project');
console.log(data);
// console.log('update_project');
// console.log(data);
update_folders( data );
update_files( data.files );
// Duplicate files
for( var _file_key in data.files )
{
var data_file = data.files[ _file_key ],
existing_file = result.files[ _file_key ];
// // Reformat versions
// result.each_version( data, function( version )
// {
// // Date
// version.moment_date = moment( version.date );
// version.date_formated = version.moment_date.format( 'LTS' );
// version.time_from_now = version.moment_date.fromNow();
// Doesn't exist yet
if( typeof existing_file === 'undefined' )
{
existing_file = Object.assign( {}, data_file );
existing_file.notif = 0;
result.files[ _file_key ] = existing_file;
// // Differencies
// var count = 0,
// modified = 0;
result.tree.add_file( _file_key, existing_file )
}
// if( !version.diff )
// {
// version.diff_ratio = 1;
// count = 1;
// modified = 1;
// }
// else
// {
// for( var _diff_key in version.diff )
// {
// var _diff = version.diff[ _diff_key ];
// count += _diff.count;
// if( _diff.added /*|| _diff.removed*/ )
// modified += _diff.count;
// }
// version.diff_ratio = modified / count;
// }
// version.diff_percent = Math.round( version.diff_ratio * 100 ) + '%';
// } );
// // Save in results
// result.data = data;
existing_file.notif++;
}
// Apply callback
if( typeof update_callback === 'function' )
@@ -204,12 +98,6 @@ application.factory(
} );
};
result.data = {
name : '',
folders: {},
files : {}
};
return result;
}
]