Add a variable (%{pubvar}) during publish

leosac · Mar 7, 2024 · 21e5f29 · 21e5f29
1 parent 2e07653
commit 21e5f29
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 2 deletions.
diff --git a/KeyManager.Library.UI/Properties/Resources.Designer.cs b/KeyManager.Library.UI/Properties/Resources.Designer.cs
diff --git a/KeyManager.Library.UI/Properties/Resources.fr.resx b/KeyManager.Library.UI/Properties/Resources.fr.resx
@@ -477,6 +477,12 @@
  <data name="PublishKeyStore" xml:space="preserve">
  <value>Publier vers un autre magasin de clés</value>
  </data>
+ <data name="PublishVariable" xml:space="preserve">
+ <value>Variable</value>
+ </data>
+ <data name="PublishVariableHelper" xml:space="preserve">
+ <value>Une variable qui peut être utilisée lors de la publication (via %{pubvar}).</value>
+ </data>
  <data name="QrCode" xml:space="preserve">
  <value>Qr Code</value>
  </data>

diff --git a/KeyManager.Library.UI/Properties/Resources.resx b/KeyManager.Library.UI/Properties/Resources.resx
@@ -477,6 +477,12 @@
  <data name="PublishKeyStore" xml:space="preserve">
  <value>Publish to another Key Store</value>
  </data>
+ <data name="PublishVariable" xml:space="preserve">
+ <value>Variable</value>
+ </data>
+ <data name="PublishVariableHelper" xml:space="preserve">
+ <value>A variable which can be used during publish (using %{pubvar}).</value>
+ </data>
  <data name="QrCode" xml:space="preserve">
  <value>Qr Code</value>
  </data>

diff --git a/KeyManager.Library.UI/PublishKeyStoreDialog.xaml b/KeyManager.Library.UI/PublishKeyStoreDialog.xaml
@@ -31,12 +31,15 @@
  <ToggleButton IsChecked="{Binding Options.ResolveKeyLinks}" Style="{StaticResource MaterialDesignSwitchLightToggleButton}" />
  <TextBlock Text="{x:Static properties:Resources.ResolveKeyLinks}" Padding="3" />
  </StackPanel>
+ <TextBox Text="{Binding Options.PublishVariable}" Margin="5,5,5,15"
+ materialDesign:HintAssist.HelperText="{x:Static properties:Resources.PublishVariableHelper}"
+ materialDesign:HintAssist.Hint="{x:Static properties:Resources.PublishVariable}"/>
  <Expander HorizontalAlignment="Stretch" Header="{x:Static properties:Resources.WrappingKey}" Margin="5">
  <StackPanel Orientation="Vertical" TextBlock.Foreground="{DynamicResource MaterialDesignBody}" Margin="24,8,24,16">
  <local:KeyEntryIdControl KeyEntryId="{Binding Options.WrappingKey.KeyId, Mode=TwoWay}" />
  <TextBox Text="{Binding Options.WrappingKey.ContainerSelector, Mode=TwoWay}" Margin="5"
- materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyVersionHelper}"
- materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyVersion}"/>
+  materialDesign:HintAssist.HelperText="{x:Static properties:Resources.KeyVersionHelper}"
+  materialDesign:HintAssist.Hint="{x:Static properties:Resources.KeyVersion}"/>
  </StackPanel>
  </Expander>
  </StackPanel>

diff --git a/KeyManager.Library/KeyStore/KeyStore.cs b/KeyManager.Library/KeyStore/KeyStore.cs
@@ -12,6 +12,7 @@ public abstract class KeyStore
 
  public const string ATTRIBUTE_NAME = "name";
  public const string ATTRIBUTE_HEXNAME = "hexname";
+ public const string ATTRIBUTE_PUBVAR = "pubvar";
 
  protected readonly JsonSerializerSettings _jsonSettings;
 
@@ -258,6 +259,11 @@ public virtual async Task Publish(KeyStore store, Func<string, KeyStore?> getFav
  {
  var changes = new List<IChangeKeyEntry>();
  initCallback?.Invoke(this, keClass, ids.Count());
+ if (!string.IsNullOrEmpty(Options?.PublishVariable))
+ {
+ Attributes[ATTRIBUTE_PUBVAR] = Options.PublishVariable;
+ }
+
  foreach (var id in ids)
  {
  var entry = await Get(id, keClass);

diff --git a/KeyManager.Library/KeyStore/StoreOptions.cs b/KeyManager.Library/KeyStore/StoreOptions.cs
@@ -30,5 +30,12 @@ public bool ResolveKeyLinks
  get => _resolveKeyLinks;
  set => SetProperty(ref _resolveKeyLinks, value);
  }
+
+ private string? _publishVariable;
+ public string? PublishVariable
+ {
+ get => _publishVariable;
+ set => SetProperty(ref _publishVariable, value);
+ }
  }
 }