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

Fixing tiddlers exportation problem and redefining commonTiddlers.

Browse Source
This commit is contained in:
Offray Vladimir Luna Cárdenas 2022-08-08 14:53:00 -05:00
parent 5200e87216
commit 70ed99691e
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -121,6 +121,7 @@ Tiddler >> created: anObject [
{ #category : #accessing } { #category : #accessing }
Tiddler >> createdAsTWFormat [ Tiddler >> createdAsTWFormat [
(self created beginsWith: 'NaN') ifTrue: [ self created: self class nowLocal].
^ ((ZTimestampFormat fromString: '20010203160506700') ^ ((ZTimestampFormat fromString: '20010203160506700')
format: (ZTimestamp fromString: self created)) copyFrom: 1 to: 17 format: (ZTimestamp fromString: self created)) copyFrom: 1 to: 17
] ]
@ -188,16 +189,18 @@ Tiddler >> exportSTONFileInto: subfolder [
{ #category : #accessing } { #category : #accessing }
Tiddler >> exportSTONFileOptimized [ Tiddler >> exportSTONFileOptimized [
| exporter wikiFolder | | exporter wikiFolder tiddlersFolder |
wikiFolder := self wiki file parent. wikiFolder := self wiki file parent.
exporter := wikiFolder / 'scripts' / 'stringAsFileInto'. exporter := wikiFolder / 'scripts' / 'stringAsFileInto'.
exporter exists ifFalse: [ self installTiddlerExporter ]. exporter exists ifFalse: [ self installTiddlerExporter ].
tiddlersFolder := wikiFolder / 'tiddlers'.
tiddlersFolder exists ifFalse: [ tiddlersFolder ensureCreateDirectory ].
OSSUnixSubprocess new OSSUnixSubprocess new
command: exporter fullName; command: exporter fullName;
arguments: { self asStonStringPretty . self fileName }; arguments: { self asStonStringPretty . self fileName };
workingDirectory: exporter parent fullName; workingDirectory: tiddlersFolder fullName;
runAndWaitOnExitDo: [ :process :outString | ^ wikiFolder / 'scripts' / self fileName ] runAndWaitOnExitDo: [ :process :outString | ^ tiddlersFolder / self fileName ]
] ]
{ #category : #accessing } { #category : #accessing }

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

@ -106,7 +106,7 @@ TiddlyWiki >> commonTiddlers [
content content
addAll: (self contentTiddlers addAll: (self contentTiddlers
select: [ :each | each isTW5Type or: [ each isNilType ]]); select: [ :each | each isTW5Type or: [ each isNilType ]]);
addAll: (self contentTiddlers select: [ :each | each isJavascript ]); "addAll: (self contentTiddlers select: [ :each | each isJavascript ]);"
addAll: (self contentTiddlers select: [ :each | each isXTiddlerDictionary ]); addAll: (self contentTiddlers select: [ :each | each isXTiddlerDictionary ]);
addAll: (self contentTiddlers select: [ :each | each isTextPlain ]); addAll: (self contentTiddlers select: [ :each | each isTextPlain ]);
addAll: (self contentTiddlers select: [ :each | each isMarkdown ]). addAll: (self contentTiddlers select: [ :each | each isMarkdown ]).