flynx/pWiki
1
1
Fork 0
mirror of https://github.com/flynx/pWiki.git synced 2025-10-29 18:10:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

minor refactorin...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-04-16 12:28:06 +03:00
parent 4fcaf6108d
commit b87382c71b
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
pwiki2.js
View File

@ -26,8 +26,8 @@
// XXX might be a good idea to make this compatible with node's path API... // XXX might be a good idea to make this compatible with node's path API...
var pWikiPath = var path =
module.pWikiPath = { module.path = {
// The page returned when getting the '/' path... // The page returned when getting the '/' path...
ROOT_PAGE: 'WikiHome', ROOT_PAGE: 'WikiHome',
@ -138,7 +138,7 @@ module.pWikiPath = {
var store = var store =
module.store = { module.store = {
exists: function(path){ exists: function(path){
return pWikiPath.normalize(path, 'string') in this }, return module.path.normalize(path, 'string') in this },
// NOTE: a path is any attribute that contains '/'... // NOTE: a path is any attribute that contains '/'...
paths: function(){ paths: function(){
@ -176,7 +176,7 @@ module.store = {
if(path.includes('*') if(path.includes('*')
|| path.includes('**')){ || path.includes('**')){
var pattern = new RegExp(`^\\/?${ var pattern = new RegExp(`^\\/?${
pWikiPath.normalize(path, 'string') module.path.normalize(path, 'string')
.replace(/\/$/g, '') .replace(/\/$/g, '')
.replace(/\//g, '\\/') .replace(/\//g, '\\/')
.replace(/\*\*/g, '.+') .replace(/\*\*/g, '.+')
@ -190,7 +190,7 @@ module.store = {
&& res.add(m[0]) && res.add(m[0])
return res }, new Set())] } return res }, new Set())] }
// search... // search...
for(var p of pWikiPath.paths(path)){ for(var p of module.path.paths(path)){
if(p in this if(p in this
// NOTE: all paths at this point and in store are // NOTE: all paths at this point and in store are
// absolute, so we check both with the leading '/' // absolute, so we check both with the leading '/'
@ -232,7 +232,7 @@ module.store = {
// //
// XXX should these return this or the data??? // XXX should these return this or the data???
update: function(path, data, mode='update'){ update: function(path, data, mode='update'){
path = pWikiPath.normalize('/'+ path, 'string') path = module.path.normalize('/'+ path, 'string')
path = path[path.length-1] == '/' ? path = path[path.length-1] == '/' ?
path.slice(0, -1) path.slice(0, -1)
: path : path
@ -245,7 +245,7 @@ module.store = {
return this }, return this },
// XXX revise... // XXX revise...
delete: function(path){ delete: function(path){
path = pWikiPath.normalize(path, 'string') path = module.path.normalize(path, 'string')
path = path[path.length-1] == '/' ? path = path[path.length-1] == '/' ?
path.slice(0, -1) path.slice(0, -1)
: path : path
@ -275,7 +275,7 @@ var relProxy =
function(name){ function(name){
return function(path='.', ...args){ return function(path='.', ...args){
return this.store[name]( return this.store[name](
pWikiPath.relative(this.path, path), module.path.relative(this.path, path),
...args) } } ...args) } }
// page interface... // page interface...
@ -297,7 +297,7 @@ module.page = {
if(arguments.length == 1){ if(arguments.length == 1){
data = path data = path
path = '.' } path = '.' }
return this.store.update(pWikiPath.relative(this.path, path), data, mode) }, return this.store.update(module.path.relative(this.path, path), data, mode) },
delete: relProxy('delete'), delete: relProxy('delete'),
// XXX // XXX