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

now page's .move(..)/.copy(..)/.delete(..) support pattern paths -- still needs cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2022-09-24 01:02:01 +03:00
parent 6e66baa213
commit 8fd14e4c38
2 changed files with 36 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pwiki/page.js
View File

@ -387,21 +387,43 @@ object.Constructor('BasePage', {
: res },
//*/
resolve: relMatchProxy('resolve'),
delete: function(path='.'){
this.__delete__(path)
return this },
delete: async function(path='.', base=true){
var page = this.get(path)
if(page.isPattern){
base
&& this.__delete__(this.path.split('*')[0])
for(var p of await this.get('path').raw){
this.__delete__(p) }
} else {
this.__delete__(path) }
return this },
// XXX should these be implemented here or proxy to .store???
copy: async function(to){
this.get(to).data = await this.data
// XXX do we sanity check to no not contain '*'???
copy: async function(to, base=true){
// copy children...
if(this.isPattern){
var base = this.path.split('*')[0]
// copy the base...
base
&& (this.get(to).data = await this.get(base).data)
for(var from of await this.get('path').raw){
this.get(pwpath.join(to, from.slice(base.length))).data =
await this.get(from).data }
// copy self...
} else {
this.get(to).data = await this.data }
// change location...
this.path = to
return this },
move: async function(to){
move: async function(to, base=true){
var from = this.path
await this.copy(to)
this.delete(from)
await this.copy(to, base)
this.delete(from, base)
return this },
//
// Find current path (non-strict)
// .find()
@ -2052,12 +2074,13 @@ module.System = {
// actions...
//
// XXX should ** be the default here...
delete: function(){
var target = this.get('..')
console.log('DELETE:', target.path)
target.delete()
target.delete('**')
// redirect...
this.renderer
@ -2078,7 +2101,7 @@ module.System = {
console.log('MOVE:', from.path, to)
to
&& await from.move(
&& await from.get('**').move(
/^[\\\/]/.test(to[0]) ?
to
: pwpath.join('..', to))

9
pwiki2.js
View File

@ -11,12 +11,9 @@
* await pwiki.get('/FlatNotes/* /delete').raw
* opening/editing/deleting from ui breaks -- macro issue??
* ...seems to be at least a problem with macros eating up quotes...
* XXX .delete() should support pattern pages, e.g.:
* pwiki.get('/path/to/*').delete()
* other actions should follow too:
* - .move(..)
* - .copy(..)
* - ...
* do not see how we can resolve this issue transparently in any
* way other than disallowing quotes...
* XXX BUG??? renaming a page does not rename sub-pages...
* XXX BUG: for some reason deleting and refreshing takes ~2x as long as
* refreshing...
* to reproduce: