Offray
/
TiddlyWikiPharo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixing folder request in methods and replacing tiddler ston exporter for common tiddlers.

This commit is contained in:
ruidajo 2022-10-10 11:13:21 -05:00
parent 854a398a50
commit 1e6bcf218f
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
repository/TiddlyWiki/Tiddler.class.st
View File

@ -184,7 +184,7 @@ Tiddler >> exportSTONFile [
Tiddler >> exportSTONFileInto: subfolder [ Tiddler >> exportSTONFileInto: subfolder [
| stonFile | | stonFile |
stonFile := self wiki file parent / subfolder / self fileName. stonFile := self wiki folder / subfolder / self fileName.
^ MarkupFile exportAsFileOn: stonFile containing: self asStonStringPretty ^ MarkupFile exportAsFileOn: stonFile containing: self asStonStringPretty
] ]

21
repository/TiddlyWiki/TiddlyWiki.class.st
View File

@ -160,16 +160,16 @@ TiddlyWiki >> contentTiddlers [
{ #category : #accessing } { #category : #accessing }
TiddlyWiki >> detectRepositoryLocal [ TiddlyWiki >> detectRepositoryLocal [
| folder folderItems | | wikiFolder folderItems |
folder := self file parent. wikiFolder := self folder.
folderItems := folder children. folderItems := wikiFolder children.
[(folderItems select: [ :path | (path basename beginsWith: '.fslckout') or: [(folderItems select: [ :path | (path basename beginsWith: '.fslckout') or:
[ path basename beginsWith: '.fossil']]) isEmpty [ path basename beginsWith: '.fossil']]) isEmpty
and:[ (folder = FileLocator root) not ]] and:[ (wikiFolder = FileLocator root) not ]]
whileTrue: [folder := folder parent. whileTrue: [wikiFolder := wikiFolder parent.
folderItems := folder children.]. folderItems := wikiFolder children.].
folder = FileLocator root ifTrue: [ ^ nil ]. wikiFolder = FileLocator root ifTrue: [ ^ nil ].
^ folder ^ wikiFolder
] ]
{ #category : #accessing } { #category : #accessing }
@ -194,7 +194,7 @@ TiddlyWiki >> exportCommonTiddlers [
| content | | content |
content := self commonTiddlers. content := self commonTiddlers.
content do: [ :each | content do: [ :each |
each exportSTONFileOptimized ]. each exportSTONFile ].
^ self tiddlersFolder ^ self tiddlersFolder
] ]
@ -313,7 +313,8 @@ TiddlyWiki >> exportTW5Tiddlers [
{ #category : #accessing } { #category : #accessing }
TiddlyWiki >> file [ TiddlyWiki >> file [
^ file
^ file ifNil: [ file := self folder / 'index.html' ]
] ]
{ #category : #accessing } { #category : #accessing }