Variadic joinPath. Close #20
This commit is contained in:
@@ -3,12 +3,12 @@
|
|||||||
[:Array<System> systems
|
[:Array<System> systems
|
||||||
[]
|
[]
|
||||||
:Map<String,Entry> entries
|
:Map<String,Entry> entries
|
||||||
(let [entryDir (Path.join [archiveDir "entries"])
|
(let [entryDir (joinPath archiveDir "entries")
|
||||||
componentDir (Path.join [archiveDir "components"])]
|
componentDir (joinPath archiveDir "components")]
|
||||||
(FileSystem.createDirectory entryDir)
|
(FileSystem.createDirectory entryDir)
|
||||||
(FileSystem.createDirectory componentDir)
|
(FileSystem.createDirectory componentDir)
|
||||||
(let [entryFiles (FileSystem.readDirectory entryDir)]
|
(let [entryFiles (FileSystem.readDirectory entryDir)]
|
||||||
(for file entryFiles =>(file.withoutExtension) (the Entry (Json.parse (File.getContent (Path.join [archiveDir "entries" file])))))))])
|
(for file entryFiles =>(file.withoutExtension) (the Entry (Json.parse (File.getContent (joinPath archiveDir "entries" file)))))))])
|
||||||
|
|
||||||
(defmethod addSystem [:System system]
|
(defmethod addSystem [:System system]
|
||||||
// Assign entries to the Systems that care about them
|
// Assign entries to the Systems that care about them
|
||||||
@@ -33,11 +33,11 @@
|
|||||||
|
|
||||||
(defmethod _saveEntry [:Entry e]
|
(defmethod _saveEntry [:Entry e]
|
||||||
(File.saveContent
|
(File.saveContent
|
||||||
(Path.join [archiveDir "entries" (e.id.withExtension "json")])
|
(joinPath archiveDir "entries" (e.id.withExtension "json"))
|
||||||
(Json.stringify e)))
|
(Json.stringify e)))
|
||||||
|
|
||||||
(defmethod componentData [:Entry e :String componentType]
|
(defmethod componentData [:Entry e :String componentType]
|
||||||
(haxe.Json.parse (File.getContent (haxe.io.Path.join [archiveDir "components" "$(dictGet e.components componentType).json"]))))
|
(haxe.Json.parse (File.getContent (joinPath archiveDir "components" "$(dictGet e.components componentType).json"))))
|
||||||
|
|
||||||
(defmethod fullData [:Entry e]
|
(defmethod fullData [:Entry e]
|
||||||
(object
|
(object
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
`(.exists .components ,e ,(symbolName componentType)))
|
`(.exists .components ,e ,(symbolName componentType)))
|
||||||
|
|
||||||
(defmacro _componentPath [archive e componentType]
|
(defmacro _componentPath [archive e componentType]
|
||||||
`(haxe.io.Path.join [.archiveDir (the nat.Archive ,archive) "components" (+ (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType)) ".json")]))
|
`(joinPath .archiveDir (the nat.Archive ,archive) "components" (+ (dictGet (the Map<String,String> .components ,e) ,(symbolName componentType)) ".json")))
|
||||||
|
|
||||||
// Changes to the object returned by (readComponent) will not be saved! Use (withWritableComponents) for making changes
|
// Changes to the object returned by (readComponent) will not be saved! Use (withWritableComponents) for making changes
|
||||||
(defmacro readComponent [archive e componentType]
|
(defmacro readComponent [archive e componentType]
|
||||||
|
|||||||
Reference in New Issue
Block a user