flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2025-12-17 08:31:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

gen2: seem to have resolved most issues...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2016-09-17 01:31:20 +03:00
parent 4804f10ad7
commit 74b8b9b45d
2 changed files with 55 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap/Doc/Path.md
View File

@ -125,7 +125,7 @@ XXX
## Relative and absolute paths (".", "..", "&lt;&lt;" and "/") ## Relative and absolute paths (".", "..", "&gt;&gt;" and "/")
XXX XXX

90
pwiki.js
View File

@ -15,37 +15,52 @@ var features = require('lib/features')
/*********************************************************************/ /*********************************************************************/
// Split path into a list and handle special path elements...
//
// The path is split via '/' or '\', no difference is made between the
// two styles, e.g. 'a/b' is the same as 'a\b'.
//
// Consecutive '/' or '\' are treated as one, e.g. 'a///b' and 'a/b'
// are the same.
//
// Special path items supported: // Special path items supported:
// Current position indicator: // "." - Current position indicator
// . a/./b/c -> a/b/c // this is simply removed from positions other than 0
// a/./b/c -> a/b/c
// ./b/c -> ./b/c // ./b/c -> ./b/c
// Up one level (left): // ".." - Consumes path item above (pop) / up one level
// .. a/../b/c -> b/c // a/../b/c -> b/c
// ../b/c -> ../b/c // ../b/c -> ../b/c
// Up one level (right): // ">>" - Consumes path item below (shift)
// << a/<</b/c -> a/c // a/>>/b/c -> a/c
// // a/b/c/>> -> a/b/c (XXX ???)
// //
// NOTE: the path is handled out of context, this leading '.' and '..'
// are left as-is.
// NOTE: '>>' has no effect when at last position (XXX ???)
var path2list = var path2list =
module.path2list = function(path){ module.path2list = function(path){
return (path instanceof Array ? path : path.split(/[\\\/]+/g)) return (path instanceof Array ? path : path.split(/[\\\/]+/g))
// handle '..' (lookahead) and trim path elements... // handle '..' (lookahead) and trim path elements...
// NOTE: this will not touch the leading '.' or '..' // NOTE: this will not touch the leading '.' or '..'
.map(function(p, i, l){ .map(function(p, i, l){
// strip '..' and '.' out... // remove '..' and '.' out at positions > 0...
return (i > 0 && (p.trim() == '..' || p.trim() == '.') return (i > 0 && (p.trim() == '..' || p.trim() == '.')
// strip items followed by '..'... // remove items followed by '..'...
|| (l[i+1] || '').trim() == '..' || (l[i+1] || '').trim() == '..'
// strip items preceded by '<<'... // remove items preceded by '>>'...
|| (l[i-1] || '').trim() == '<<') ? || (l[i-1] || '').trim() == '>>') ?
null null
: p.trim() }) : p.trim() })
// cleanup and clear '.'... // cleanup and clear '>>'...
.filter(function(p){ .filter(function(p){
return p != null return p != null
&& p != '' && p != ''
&& p != '<<' })} && p != '>>' })}
// Normalize path...
//
// This is the same as path2list(..) but also joins the path with '/'
var normalizePath = var normalizePath =
module.normalizePath = function(path){ return path2list(path).join('/') } module.normalizePath = function(path){ return path2list(path).join('/') }
@ -180,6 +195,7 @@ module.pWikiPageActions = actions.Actions({
config: { config: {
'home-page': 'WikiHome', 'home-page': 'WikiHome',
'default-page': 'EmptyPage', 'default-page': 'EmptyPage',
'no-match-page': 'NoMatch',
'system-path': 'System', 'system-path': 'System',
@ -208,27 +224,24 @@ module.pWikiPageActions = actions.Actions({
// -> order list (+ index) // -> order list (+ index)
// -> parent (relative path) // -> parent (relative path)
// (recur) // (recur)
// XXX add shift mechanics to path syntax to remove leading items...
// ...this is like '..' but applied to path head...
// ....this is more of a normalizePath(..) thing...
resolve: ['Path/Resolve relative path and expand path variables', resolve: ['Path/Resolve relative path and expand path variables',
function(path){ function(path){
path = normalizePath(path)
// path variables... // path variables...
// XXX make this more modular... // XXX make this more modular...
path = path path = path
.replace(/\$NOW|\$\{NOW\}/g, Date.now()) .replace(/\$NOW|\$\{NOW\}/g, Date.now())
.replace(/\$INDEX|\$\{INDEX\}/g, this.at()) .replace(/\$INDEX|\$\{INDEX\}/g, this.at())
//.replace(/\$TITLE|\$\{TITLE\}/g, this.title()) .replace(/\$TITLE|\$\{TITLE\}/g, this.title())
// NOTE: these are equivalent to '..' and '.' but not // NOTE: these are equivalent to '..' and '.' but not
// identical -- the variables are useful for things // identical -- the variables are useful for things
// like moving a page to "Trash/$PATH" // like moving a page to:
// XXX might be a good idea to implement something // "Trash/$PATH"
// like shift path syntax (like '..' but on // ...to move the above page out of trash move it to:
// prefixed items) to remove head path sections... // ">>/$PATH"
//.replace(/\$BASE|\$\{BASE\}/g, this.base()) .replace(/\$BASE|\$\{BASE\}/g, this.base())
//.replace(/\$PATH|\$\{PATH\}/g, this.path()) .replace(/\$PATH|\$\{PATH\}/g, this.path())
path = normalizePath(path)
// relative paths -- "." and ".." // relative paths -- "." and ".."
if(path.indexOf('.') >= 0){ if(path.indexOf('.') >= 0){
@ -326,11 +339,15 @@ module.pWikiPageActions = actions.Actions({
this.__location = value this.__location = value
} }
}], }],
// XXX pattern does not match anything needs to be handled correctly...
path: ['Page/Get or set path', path: ['Page/Get or set path',
function(value){ function(value){
// get explcit path from location (acounting for 'at')... // get explcit path from location (acounting for 'at')...
if(arguments.length == 0){ if(arguments.length == 0){
return this.order(true)[this.at()] return this.order(true)[this.at()]
// nothing matched the pattern...
|| this.config['no-match-page']
|| ''
// move page to path... // move page to path...
} else if(value != null) { } else if(value != null) {
@ -538,11 +555,9 @@ module.pWikiPageActions = actions.Actions({
return [ path ] return [ path ]
} }
// store order in a pecific path pattern... // store order in a specific path pattern...
// NOTE: each path pattern may have a different order... // NOTE: each path pattern may have a different order...
// XXX var parent = this.wiki.data(path) || {}
//var parent = this.get(path)
var parent = this.get('..')
// get full paths... // get full paths...
if(order === true || order === false){ if(order === true || order === false){
@ -563,10 +578,12 @@ module.pWikiPageActions = actions.Actions({
if(order == null){ if(order == null){
//var pages = this.wiki.match(parent.path() + '/*') //var pages = this.wiki.match(parent.path() + '/*')
var pages = this.wiki.match(path) var pages = this.wiki.match(path)
var order = (this.__order || parent.attr('order') || []) .filter(function(p){
return p.indexOf('*') <= 0 })
var order = (this.__order || parent.order || [])
// clear all paths that are not currently visible... // clear all paths that are not currently visible...
// NOTE: paths may not be visible because they are // NOTE: paths may not be visible because they are
// fitered out by .location().path pattern... // filtered out by .location().path pattern...
.filter(function(p){ .filter(function(p){
return pages.indexOf(p) >= 0 }) return pages.indexOf(p) >= 0 })
@ -577,18 +594,18 @@ module.pWikiPageActions = actions.Actions({
return path2list(p).pop() }) return path2list(p).pop() })
// expand titles to full paths... // expand titles to full paths...
// XXX revise...
} else { } else {
var base = this.base()
order = order order = order
.map(function(t){ .map(function(t){
return normalizePath(base +'/'+ t)}) return normalizePath('./'+ t)})
} }
// sorted... // sorted...
if(order.length > 0){ if(order.length > 0){
// get unsorted_first config: // get unsorted_first config:
// page || config || false // page || config || false
var unsorted_first = parent.attr('order-unsorted-first') var unsorted_first = parent['order-unsorted-first']
unsorted_first = unsorted_first == null ? unsorted_first = unsorted_first == null ?
this.config['order-unsorted-first'] this.config['order-unsorted-first']
: unsorted_first : unsorted_first
@ -615,7 +632,8 @@ module.pWikiPageActions = actions.Actions({
} else if(path2list(path).pop().indexOf('*') >= 0 } else if(path2list(path).pop().indexOf('*') >= 0
// check if no patterns are in path other than the last elem... // check if no patterns are in path other than the last elem...
&& path2list(path).slice(0, -1).join('/').match(/\*/g) == null) { && path2list(path).slice(0, -1).join('/').match(/\*/g) == null) {
parent.attr('order', order) parent.order = order
this.wiki.data(path, parent)
delete this.__order delete this.__order
// set local manual order... // set local manual order...