Export: now only inquire for metadata when necessary. (#89)

Exportformats: new function supportsMetaData. Changes in exportformats.xsd, and exportformats.xml.
bengtmartensson · Jun 27, 2016 · 8b02c3a · 8b02c3a
1 parent 74a33bd
commit 8b02c3a
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 2 deletions.
diff --git a/IrScrutinizer/src/main/config/exportformats.xml b/IrScrutinizer/src/main/config/exportformats.xml
@@ -1463,7 +1463,7 @@ carrier_frequency </xsl:text>
     </xsl:stylesheet>
 </exportformats:exportformat>
 
-<exportformats:exportformat name="irplus" extension="irplus" multiSignal="true" simpleSequence="false">
+<exportformats:exportformat name="irplus" extension="irplus" multiSignal="true" simpleSequence="false" metadata="true">
 <xsl:stylesheet xmlns:girr="http://www.harctoolbox.org/Girr" exclude-result-prefixes="girr"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
     <xsl:output method="xml" indent="yes" omit-xml-declaration="yes"/>

diff --git a/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/GuiMain.java b/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/GuiMain.java
@@ -1124,7 +1124,7 @@ private HashMap<String, Command> getCommands(NamedIrSignal.LearnedIrSignalTableM
     }
 
     private File saveCommands(HashMap<String, Command> commands, String source, String title, RemoteSetExporter exporter) throws FileNotFoundException, IrpMasterException, IOException {
-        if (properties.getExportInquireDeviceData()) {
+        if (properties.getExportInquireDeviceData() && exporter.supportsMetaData()) {
             Remote.MetaData newMetaData = MetaDataDialog.inquireMetaData(metaData, this);
             if (newMetaData == null) // user bailed out
                 return null;

diff --git a/...er/src/main/java/org/harctoolbox/irscrutinizer/exporter/DynamicRemoteSetExportFormat.java b/...er/src/main/java/org/harctoolbox/irscrutinizer/exporter/DynamicRemoteSetExportFormat.java
@@ -51,6 +51,7 @@ public class DynamicRemoteSetExportFormat extends RemoteSetExporter implements I
     private final String extension;
     private final boolean simpleSequence;
     private final boolean binary;
+    private final boolean metadata;
     private final Document xslt;
 
     private DynamicRemoteSetExportFormat(Element el) {
@@ -59,6 +60,7 @@ private DynamicRemoteSetExportFormat(Element el) {
         this.extension = el.getAttribute("extension");
         this.simpleSequence = Boolean.parseBoolean(el.getAttribute("simpleSequence"));
         this.binary = Boolean.parseBoolean(el.getAttribute("binary"));
+        this.metadata = Boolean.parseBoolean(el.getAttribute("metadata"));
 
         xslt = XmlUtils.newDocument(true);
         Node stylesheet = el.getElementsByTagNameNS("http://www.w3.org/1999/XSL/Transform", "stylesheet").item(0);
@@ -113,6 +115,11 @@ public String getPreferredFileExtension() {
         return extension;
     }
 
+    @Override
+    public boolean supportsMetaData() {
+        return metadata;
+    }
+
     @Override
     public void export(RemoteSet remoteSet, String title, int count, File saveFile, String charsetName) throws IOException, IrpMasterException {
         export(remoteSet, title, count, saveFile.getCanonicalPath(), charsetName);

diff --git a/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/exporter/GirrExporter.java b/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/exporter/GirrExporter.java
@@ -86,4 +86,9 @@ public String getFormatName() {
     public boolean supportsEmbeddedFormats() {
         return true;
     }
+
+    @Override
+    public boolean supportsMetaData() {
+        return true;
+    }
 }
diff --git a/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/exporter/LircExporter.java b/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/exporter/LircExporter.java
@@ -81,6 +81,11 @@ public String getFormatName() {
         return "LIRC";
     }
 
+    @Override
+    public boolean supportsMetaData() {
+        return true;
+    }
+
     // Jirc's definition of Lirc names:
     // ('!' .. '{' | '}' .. '~' | '\u00A1' .. '\u00FF')+
     private static String lircName(String key) {

diff --git a/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/exporter/RemoteSetExporter.java b/IrScrutinizer/src/main/java/org/harctoolbox/irscrutinizer/exporter/RemoteSetExporter.java
@@ -134,4 +134,8 @@ public boolean supportsEmbeddedFormats() {
     public boolean considersRepetitions() {
         return false;
     }
+
+    public boolean supportsMetaData() {
+        return false;
+    }
 }
diff --git a/IrScrutinizer/src/main/schemas/exportformats.xsd b/IrScrutinizer/src/main/schemas/exportformats.xsd
@@ -71,6 +71,11 @@
                     <xs:documentation>True if the files are binary files.</xs:documentation>
                 </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="metadata" type="xs:boolean" default="false">
+                <xs:annotation>
+                    <xs:documentation>True if the format support remote meta data (not necessarily all).</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>
 

diff --git a/schemas/exportformats.xsd b/schemas/exportformats.xsd
@@ -71,6 +71,11 @@
                     <xs:documentation>True if the files are binary files.</xs:documentation>
                 </xs:annotation>
             </xs:attribute>
+            <xs:attribute name="metadata" type="xs:boolean" default="false">
+                <xs:annotation>
+                    <xs:documentation>True if the format support remote meta data (not necessarily all).</xs:documentation>
+                </xs:annotation>
+            </xs:attribute>
         </xs:complexType>
     </xs:element>