Prepaing merge with GT 0.8.690

repository/TiddlyWiki/TiddlyWiki.class.st

@@ -8,11 +8,22 @@ Class {
 	#name : #TiddlyWiki,
 	#superclass : #Object,
 	#instVars : [
-		'tiddlers'
+		'tiddlers',
+		'file'
 	],
 	#category : #'TiddlyWiki-Model'
 }
 
+{ #category : #accessing }
+TiddlyWiki >> file [
+	^ file
+]
+
+{ #category : #accessing }
+TiddlyWiki >> file: anObject [
+	file := anObject
+]
+
 { #category : #'instance creation' }
 TiddlyWiki >> fromJSONString: aString [
 	| rawData |
@@ -43,3 +54,10 @@ TiddlyWiki >> tiddlers: anOrderedCollection [
 
 	tiddlers := anOrderedCollection
 ]
+
+{ #category : #accessing }
+TiddlyWiki >> tiddlersJSONFile [
+	file ifNil: [ self inform: 'You need to export tiddlers as JSON from TiddlyWiki'. 
+		^ nil ].
+	^ file parent / 'tiddlers.json'.
+]