From 1e6bcf218f4a175cfdb6995339b042d252fb48d8 Mon Sep 17 00:00:00 2001 From: ruidajo Date: Mon, 10 Oct 2022 11:13:21 -0500 Subject: [PATCH] Fixing folder request in methods and replacing tiddler ston exporter for common tiddlers. --- repository/TiddlyWiki/Tiddler.class.st | 2 +- repository/TiddlyWiki/TiddlyWiki.class.st | 21 +++++++++++---------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/repository/TiddlyWiki/Tiddler.class.st b/repository/TiddlyWiki/Tiddler.class.st index a339262..28ab1b0 100644 --- a/repository/TiddlyWiki/Tiddler.class.st +++ b/repository/TiddlyWiki/Tiddler.class.st @@ -184,7 +184,7 @@ Tiddler >> exportSTONFile [ Tiddler >> exportSTONFileInto: subfolder [ | stonFile | - stonFile := self wiki file parent / subfolder / self fileName. + stonFile := self wiki folder / subfolder / self fileName. ^ MarkupFile exportAsFileOn: stonFile containing: self asStonStringPretty ] diff --git a/repository/TiddlyWiki/TiddlyWiki.class.st b/repository/TiddlyWiki/TiddlyWiki.class.st index 735d911..5e172ce 100644 --- a/repository/TiddlyWiki/TiddlyWiki.class.st +++ b/repository/TiddlyWiki/TiddlyWiki.class.st @@ -160,16 +160,16 @@ TiddlyWiki >> contentTiddlers [ { #category : #accessing } TiddlyWiki >> detectRepositoryLocal [ - | folder folderItems | - folder := self file parent. - folderItems := folder children. + | wikiFolder folderItems | + wikiFolder := self folder. + folderItems := wikiFolder children. [(folderItems select: [ :path | (path basename beginsWith: '.fslckout') or: [ path basename beginsWith: '.fossil']]) isEmpty - and:[ (folder = FileLocator root) not ]] - whileTrue: [folder := folder parent. - folderItems := folder children.]. - folder = FileLocator root ifTrue: [ ^ nil ]. - ^ folder + and:[ (wikiFolder = FileLocator root) not ]] + whileTrue: [wikiFolder := wikiFolder parent. + folderItems := wikiFolder children.]. + wikiFolder = FileLocator root ifTrue: [ ^ nil ]. + ^ wikiFolder ] { #category : #accessing } @@ -194,7 +194,7 @@ TiddlyWiki >> exportCommonTiddlers [ | content | content := self commonTiddlers. content do: [ :each | - each exportSTONFileOptimized ]. + each exportSTONFile ]. ^ self tiddlersFolder ] @@ -313,7 +313,8 @@ TiddlyWiki >> exportTW5Tiddlers [ { #category : #accessing } TiddlyWiki >> file [ - ^ file + + ^ file ifNil: [ file := self folder / 'index.html' ] ] { #category : #accessing }