Fixing folder request in methods and replacing tiddler ston exporter for common tiddlers.
This commit is contained in:
parent
854a398a50
commit
1e6bcf218f
@ -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
|
||||
]
|
||||
|
||||
|
@ -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 }
|
||||
|
Loading…
Reference in New Issue
Block a user