bump version

5065efd3 incorrectly changed to doing an rmtree of the entire target
since that was what editionify needed. Editionify should clean the
target directory, but the single HTML file build should not (it ended up
wiping my git repository from my hard drive). We might wish to revisit
this particular fix in the future since it still fails to delete removed
extimages, but this doesn't seem like a big deal.

cli_docs/conf.py

@@ -18,9 +18,9 @@ copyright = '2021 Soren Bjornstad'
 author = 'Soren Bjornstad'
 
 # The short X.Y version
-version = "0.1.1"
+version = "0.1.2"
 # The full version, including alpha/beta/rc tags
-release = "0.1.1"
+release = "0.1.2"
 
 
 # -- General configuration ---------------------------------------------------

docs/index.html

@@ -1206,13 +1206,13 @@ github: https://github.com/sobjornstad/zettelkasten-sib</pre>
 <pre>hide</pre>
 </div>
 <div created="20200913200724872" modified="20201120173215063" title="$:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/permalink" type="text/vnd.tiddlywiki">
-<pre>hide</pre>
+<pre>show</pre>
 </div>
 <div created="20200404141629548" creator="soren" modified="20200404141630712" modifier="soren" title="$:/config/ViewToolbarButtons/Visibility/$:/plugins/bimlas/locator/viewtemplate/open-in-sidebar" type="text/vnd.tiddlywiki">
 <pre>hide</pre>
 </div>
-<div created="20210525001044166" modified="20210525000849030" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
-<pre>show</pre>
+<div created="20210525001044166" creator="soren" modified="20210922125743198" modifier="soren" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
+<pre>hide</pre>
 </div>
 <div created="20210525001045047" modified="20210525000850061" title="$:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
 <pre>show</pre>
@@ -16043,22 +16043,38 @@ Info: CoreVersion parameter is needed for TiddlyWiki only!
     }
 }</pre>
 </div>
-<div caption="Copy public Zettelkasten link" created="20201120172611922" creator="soren" description="Copy a link to this tiddler in the public Zettelkasten" list-after="$:/core/ui/Buttons/info" modified="20210825162715432" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
+<div caption="copy public link" created="20201120172611922" creator="soren" description="Copy a link to this tiddler in the public Zettelkasten" list-after="$:/core/ui/Buttons/info" modified="20210922125543768" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyPublicZettelkastenLink" type="text/vnd.tiddlywiki">
 <pre>\whitespace trim
 \define copier()
   https://zettelkasten.sorenbjornstad.com/#$(tidTitle)$
 \end
 
 &lt;$set name=&quot;tidTitle&quot; value={{!!title}}&gt;
-&lt;$button message=&quot;tm-copy-to-clipboard&quot; param=&lt;&lt;copier&gt;&gt; tooltip={{!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+&lt;$button message=&quot;tm-copy-to-clipboard&quot; param=&lt;&lt;copier&gt;&gt; tooltip={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-icons&gt;match[yes]]&quot;&gt;
   {{$:/core/images/permalink-button}}
+	&lt;/$list&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-text&gt;match[yes]]&quot;&gt;
+	&lt;span class=&quot;tc-btn-text&quot;&gt;
+	&lt;$text text=&quot; &quot;/&gt;
+	&lt;$text text={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}}/&gt;
+	&lt;/span&gt;
+	&lt;/$list&gt;
 &lt;/$button&gt;
 &lt;/$set&gt;</pre>
 </div>
-<div caption="Copy tiddler title" created="20200419143537510" creator="soren" description="Copy the name of this tiddler to the clipboard" list-after="$:/core/ui/Buttons/info" modified="20210825162721583" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
+<div caption="copy tiddler title" created="20200419143537510" creator="soren" description="Copy the name of this tiddler to the clipboard" list-after="$:/core/ui/Buttons/info" modified="20210922125723154" modifier="soren" tags="$:/tags/ViewToolbar" title="$:/sib/Buttons/CopyTitleReference" type="text/vnd.tiddlywiki">
 <pre>\whitespace trim
-&lt;$button message=&quot;tm-copy-to-clipboard&quot; param={{!!title}} tooltip={{!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
-	&lt;i class=&quot;far fa-copy&quot; style=&quot;font-size:160%; position:relative; bottom:-4px; left:-1px;&quot;/&gt;
+&lt;$button message=&quot;tm-copy-to-clipboard&quot; param={{!!title}} tooltip={{$:/sib/Buttons/CopyTitleReference!!caption}} class=&lt;&lt;tv-config-toolbar-class&gt;&gt;&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-icons&gt;match[yes]]&quot;&gt;
+		&lt;i class=&quot;far fa-copy&quot; style=&quot;font-size:160%; position:relative; bottom:-4px; left:-1px;&quot;/&gt;
+	&lt;/$list&gt;
+	&lt;$list filter=&quot;[&lt;tv-config-toolbar-text&gt;match[yes]]&quot;&gt;
+	&lt;span class=&quot;tc-btn-text&quot;&gt;
+	&lt;$text text=&quot; &quot;/&gt;
+	&lt;$text text={{$:/sib/Buttons/CopyTitleReference!!caption}}/&gt;
+	&lt;/span&gt;
+	&lt;/$list&gt;
 &lt;/$button&gt;</pre>
 </div>
 <div caption="Excise private chunk" condition="[&lt;targetTiddler&gt;type[]] [&lt;targetTiddler&gt;type[text/vnd.tiddlywiki]] +[first[]]" created="20210522034413324" description="Create a new private chunk from the selection" icon="$:/core/images/locked-padlock" list-after="$:/core/ui/EditorToolbar/excise" modified="20210522034828757" shortcuts="((excise-private-chunk))" tags="$:/tags/EditorToolbar" title="$:/sib/Buttons/excise-private-chunk" type="text/vnd.tiddlywiki">

setup.py

@@ -9,7 +9,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="tzk",
-    version="0.1.1",
+    version="0.1.2",
     author="Soren I. Bjornstad",
     author_email="zettelkasten@sorenbjornstad.com",
     description="Build tool for TiddlyWiki Zettelkasten",

tzk/builders.py

@@ -278,7 +278,8 @@ def compile_html_file(
                           will be placed, relative to the private wiki's root directory.
                           Default ``output/public_site``.
     :param overwrite:     If the ``output_folder`` already exists,
-                          should we overwrite it? Default True.
+                          should we overwrite any files in it with the same name?
+                          Default True.
     :param externalize_attachments: If True, update tiddlers that match
                                     the ``attachment_filter`` parameter to point to
                                     external versions of their content.
@@ -311,13 +312,10 @@ def compile_html_file(
              f"(To overwrite any files existing in the output folder, "
              f"set overwrite = True for this builder.)")
 
-    try:
-        shutil.rmtree(output_folder)
-    except FileNotFoundError:
-        pass
     shutil.copytree(
         Path(build_state['public_wiki_folder']) / "output",
         Path(output_folder),
+        dirs_exist_ok=True
     )
     info(f"Successfully copied built output to {os.path.abspath(output_folder)}.")
 

tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__core_ui_Buttons_permalink.tid

@@ -3,4 +3,4 @@ modified: 20201120173215063
 title: $:/config/ViewToolbarButtons/Visibility/$:/core/ui/Buttons/permalink
 type: text/vnd.tiddlywiki
 
-hide
+show

tzk/editions/tzk/tiddlers/$__config_ViewToolbarButtons_Visibility_$__sib_Buttons_CopyPublicZettelkastenLink.tid

@@ -1,6 +1,8 @@
 created: 20210525001044166
-modified: 20210525000849030
+creator: soren
+modified: 20210922125743198
+modifier: soren
 title: $:/config/ViewToolbarButtons/Visibility/$:/sib/Buttons/CopyPublicZettelkastenLink
 type: text/vnd.tiddlywiki
 
-show
+hide

tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyPublicZettelkastenLink.tid

@@ -1,9 +1,9 @@
-caption: Copy public Zettelkasten link
+caption: copy public link
 created: 20201120172611922
 creator: soren
 description: Copy a link to this tiddler in the public Zettelkasten
 list-after: $:/core/ui/Buttons/info
-modified: 20210825162715432
+modified: 20210922125543768
 modifier: soren
 tags: $:/tags/ViewToolbar
 title: $:/sib/Buttons/CopyPublicZettelkastenLink
@@ -15,7 +15,15 @@ type: text/vnd.tiddlywiki
 \end
 
 <$set name="tidTitle" value={{!!title}}>
-<$button message="tm-copy-to-clipboard" param=<<copier>> tooltip={{!!caption}} class=<<tv-config-toolbar-class>>>
+<$button message="tm-copy-to-clipboard" param=<<copier>> tooltip={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}} class=<<tv-config-toolbar-class>>>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
   {{$:/core/images/permalink-button}}
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<span class="tc-btn-text">
+	<$text text=" "/>
+	<$text text={{$:/sib/Buttons/CopyPublicZettelkastenLink!!caption}}/>
+	</span>
+	</$list>
 </$button>
 </$set>

tzk/editions/tzk/tiddlers/$__sib_Buttons_CopyTitleReference.tid

@@ -1,15 +1,23 @@
-caption: Copy tiddler title
+caption: copy tiddler title
 created: 20200419143537510
 creator: soren
 description: Copy the name of this tiddler to the clipboard
 list-after: $:/core/ui/Buttons/info
-modified: 20210825162721583
+modified: 20210922125723154
 modifier: soren
 tags: $:/tags/ViewToolbar
 title: $:/sib/Buttons/CopyTitleReference
 type: text/vnd.tiddlywiki
 
 \whitespace trim
-<$button message="tm-copy-to-clipboard" param={{!!title}} tooltip={{!!caption}} class=<<tv-config-toolbar-class>>>
-	<i class="far fa-copy" style="font-size:160%; position:relative; bottom:-4px; left:-1px;"/>
+<$button message="tm-copy-to-clipboard" param={{!!title}} tooltip={{$:/sib/Buttons/CopyTitleReference!!caption}} class=<<tv-config-toolbar-class>>>
+	<$list filter="[<tv-config-toolbar-icons>match[yes]]">
+		<i class="far fa-copy" style="font-size:160%; position:relative; bottom:-4px; left:-1px;"/>
+	</$list>
+	<$list filter="[<tv-config-toolbar-text>match[yes]]">
+	<span class="tc-btn-text">
+	<$text text=" "/>
+	<$text text={{$:/sib/Buttons/CopyTitleReference!!caption}}/>
+	</span>
+	</$list>
 </$button>

tzk/util.py

@@ -10,7 +10,7 @@ import sys
 from typing import Any, Callable, Dict, NoReturn
 
 
-TZK_VERSION = "0.1.1"
+TZK_VERSION = "0.1.2"
 
 
 class BuildError(Exception):