diff --git a/projects/nat-archive-tool/src/nat/ArchiveController.kiss b/projects/nat-archive-tool/src/nat/ArchiveController.kiss index e298eb5c..2a780a93 100644 --- a/projects/nat-archive-tool/src/nat/ArchiveController.kiss +++ b/projects/nat-archive-tool/src/nat/ArchiveController.kiss @@ -188,6 +188,17 @@ (flatten (for name names (CreateEntry name)))) + (defCommand CreateMediaEntry [medium (Text null) name (Text null)] + [(archive.createEntry ->e { + (addComponent archive e Name name) + (addTags archive e ["media" medium])})]) + + (defCommand CreateMediaEntries [medium (Text null) names (VarText null)] + // createEntry returns a list, so these lists must be flattened + (flatten (for name names + (CreateEntry name)))) + + // TODO use Tag and VarTag arg types for AddTags and RemoveTags (defCommand AddTags [entries (SelectedEntries 1 null) tagsToAdd (VarText null)] (doFor e entries diff --git a/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss b/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss index e732303e..9e17c2c3 100644 --- a/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss +++ b/projects/nat-archive-tool/src/nat/systems/WikipediaImageSystem.kiss @@ -21,10 +21,7 @@ (.urlDecode (url.withoutDirectory)) // Some symbols shouldn't be decoded because they're invalid in file systems! "\"" "%22"))] - // TODO write a macro that either does both print and displayMessage if a ui is available - (when ui - (ui.displayMessage "Downloading $title image: $url")) - (print url "downloading") + (log ui "Downloading $title image: $url") (assertProcess "curl" ["--output" filePath url]) filePath))) // Trigger the creation of a new Images component including the wikipedia images diff --git a/projects/nat-flixel-desktop-playground/source/PlayState.kiss b/projects/nat-flixel-desktop-playground/source/PlayState.kiss index b45e804a..9e2d19a5 100644 --- a/projects/nat-flixel-desktop-playground/source/PlayState.kiss +++ b/projects/nat-flixel-desktop-playground/source/PlayState.kiss @@ -214,9 +214,9 @@ (method handleChanges [:Archive archive :ChangeSet changeSet] (doFor e changeSet // process the WikipediaImageSystem and run spriteSystem process on newly created entries that get one - (archive.processSystems) + (archive.processSystems this) // Do a second loop through the systems, so Playground systems that trigger Core systems have their effects processed - (archive.processSystems) + (archive.processSystems this) // Entries whose data changed to remove them from the sprite pool will already have been removed // by refreshEntry()