diff --git a/src/main/java/pro/litvinovg/w2phtml/W2PHTMLExtension.java b/src/main/java/pro/litvinovg/w2phtml/W2PHTMLExtension.java index ba15ae0..8354937 100644 --- a/src/main/java/pro/litvinovg/w2phtml/W2PHTMLExtension.java +++ b/src/main/java/pro/litvinovg/w2phtml/W2PHTMLExtension.java @@ -4,6 +4,7 @@ import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import pro.litvinovg.w2phtml.gui.ConfigurationWindow; +import pro.litvinovg.w2phtml.gui.ConversionExecutor; import pro.litvinovg.w2phtml.gui.Document; import com.sun.star.lib.uno.helper.Factory; @@ -13,6 +14,9 @@ import java.util.Comparator; import javax.swing.UnsupportedLookAndFeelException; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.sun.star.beans.Property; import com.sun.star.beans.XPropertyContainer; import com.sun.star.beans.XPropertySet; @@ -40,6 +44,8 @@ public final class W2PHTMLExtension extends WeakBase private XDocumentPropertiesSupplier documentPropertiesSupplier; private static final String m_implementationName = W2PHTMLExtension.class.getName(); private static final String[] m_serviceNames = { "pro.litvinovg.libreoffice.Writer2PaginatedHTML" }; + private static final Logger logger = LoggerFactory.getLogger(W2PHTMLExtension.class); + public W2PHTMLExtension(XComponentContext componentContext) { diff --git a/src/main/java/pro/litvinovg/w2phtml/gui/ConfigurationWindow.java b/src/main/java/pro/litvinovg/w2phtml/gui/ConfigurationWindow.java index b353dd1..904ba8a 100644 --- a/src/main/java/pro/litvinovg/w2phtml/gui/ConfigurationWindow.java +++ b/src/main/java/pro/litvinovg/w2phtml/gui/ConfigurationWindow.java @@ -5,7 +5,6 @@ import java.awt.EventQueue; import javax.swing.JFrame; import javax.swing.UIManager; -import com.github.andrewoma.dexx.collection.Map; import com.sun.star.uno.XComponentContext; import pro.litvinovg.xml.Debug; @@ -963,7 +962,7 @@ public class ConfigurationWindow extends JFrame { UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); } catch (Throwable e) { String message = e.getLocalizedMessage(); - Debug.printLog(message, context); + JOptionPane.showMessageDialog(singleFrame, message); } EventQueue.invokeLater(new Runnable() { public void run() { @@ -976,8 +975,7 @@ public class ConfigurationWindow extends JFrame { } catch (Throwable e) { String message = e.getLocalizedMessage(); - - Debug.printLog(message, context); + JOptionPane.showMessageDialog(singleFrame, message); } } }); diff --git a/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java b/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java index cc4aff1..4c831d9 100644 --- a/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java +++ b/src/main/java/pro/litvinovg/w2phtml/gui/ConversionExecutor.java @@ -5,6 +5,7 @@ import java.io.File; import java.io.FilenameFilter; import java.io.IOException; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.Iterator; import java.util.List; @@ -18,13 +19,18 @@ import javax.swing.JOptionPane; import javax.swing.JPanel; import javax.swing.JTextField; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.sun.star.uno.XComponentContext; import w2phtml.Application; +import w2phtml.rdf.Metadata; public class ConversionExecutor { HashMap options = new HashMap(); + private static final Logger logger = LoggerFactory.getLogger(ConversionExecutor.class); private String format = null; private String inputFilePath = null; private String outputFilePath = null; @@ -175,12 +181,22 @@ public class ConversionExecutor { if (inputFile.isDirectory()) { convertAllInDir(); } else { - Application.main(prepareArgs()); + tryConversion(); JOptionPane.showMessageDialog(frame, "Conversion completed."); } } + private void tryConversion() { + try { + Application.main(prepareArgs()); + } catch (Exception e ) { + logger.error("Conversion failed."); + logger.error("Params: " + Arrays.toString(prepareArgs())); + } + + } + private void convertAllInDir() { File inputDir = new File(inputFilePath); if (!inputDir.isDirectory()) { @@ -228,7 +244,7 @@ public class ConversionExecutor { } inputFilePath = inputFile.getAbsolutePath(); - Application.main(prepareArgs()); + tryConversion(); } diff --git a/src/main/java/pro/litvinovg/w2phtml/gui/Document.java b/src/main/java/pro/litvinovg/w2phtml/gui/Document.java index 0e7058d..9f00306 100644 --- a/src/main/java/pro/litvinovg/w2phtml/gui/Document.java +++ b/src/main/java/pro/litvinovg/w2phtml/gui/Document.java @@ -2,34 +2,17 @@ package pro.litvinovg.w2phtml.gui; import java.io.File; import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashMap; -import java.util.Map; -import com.sun.star.beans.IllegalTypeException; -import com.sun.star.beans.NotRemoveableException; -import com.sun.star.beans.Property; -import com.sun.star.beans.PropertyExistException; -import com.sun.star.beans.PropertyValue; -import com.sun.star.beans.PropertyVetoException; -import com.sun.star.beans.UnknownPropertyException; -import com.sun.star.beans.XPropertyContainer; -import com.sun.star.beans.XPropertySet; -import com.sun.star.beans.XPropertySetInfo; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.sun.star.document.XDocumentProperties; import com.sun.star.document.XDocumentPropertiesSupplier; -import com.sun.star.frame.XController; import com.sun.star.frame.XDesktop; -import com.sun.star.frame.XDispatch; -import com.sun.star.frame.XDispatchHelper; import com.sun.star.frame.XDispatchProvider; import com.sun.star.frame.XFrame; import com.sun.star.frame.XModel; import com.sun.star.frame.XStorable; -import com.sun.star.lang.IllegalArgumentException; -import com.sun.star.lang.WrappedTargetException; import com.sun.star.lang.XComponent; import com.sun.star.lang.XMultiComponentFactory; import com.sun.star.lang.XMultiServiceFactory; @@ -39,12 +22,12 @@ import com.sun.star.text.XTextDocument; import com.sun.star.uno.UnoRuntime; import com.sun.star.uno.XComponentContext; import com.sun.star.util.XModifiable; -import com.sun.star.view.XViewSettingsSupplier; - -import pro.litvinovg.xml.Debug; public class Document { + private static final Logger logger = LoggerFactory.getLogger(Document.class); + + private XComponentContext context; private XDesktop xDesktop; private XMultiComponentFactory multiComponentFactory; @@ -78,7 +61,7 @@ public class Document { } XTextDocument textDoc = UnoRuntime.queryInterface(XTextDocument.class, currentDocument); if (textDoc == null) { - Debug.printLog("Error. TextDoc is null.", componentContext); + logger.error("Error. TextDoc is null."); return; } XStorable storable = UnoRuntime.queryInterface(XStorable.class, textDoc); @@ -92,12 +75,12 @@ public class Document { XModifiable modifieable = UnoRuntime.queryInterface(XModifiable.class, textDoc); if (modifieable == null || modifieable.isModified()) { - Debug.printLog("Document is modified. Save changes before conversion.", componentContext); + logger.error("Document is modified. Save changes before conversion."); } else { //Debug.printLog("Document isn't modified", componentContext); } if (!storable.hasLocation()) { - Debug.printLog("Document is not saved. Save document before conversion.", componentContext); + logger.error("Document is not saved. Save document before conversion."); return; } String url = model.getURL(); @@ -108,7 +91,7 @@ public class Document { } } catch (Throwable e) { - Debug.printLog(e.getStackTrace().toString(), componentContext); + logger.error(e.toString()); return; } } diff --git a/src/main/java/pro/litvinovg/w2phtml/gui/LogAppender.java b/src/main/java/pro/litvinovg/w2phtml/gui/LogAppender.java new file mode 100644 index 0000000..d20c7e8 --- /dev/null +++ b/src/main/java/pro/litvinovg/w2phtml/gui/LogAppender.java @@ -0,0 +1,43 @@ +package pro.litvinovg.w2phtml.gui; + +import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; + +import ch.qos.logback.core.AppenderBase; + +public class LogAppender extends AppenderBase { + + private Map eventMap = new ConcurrentHashMap(); + private String prefix; + private static LogAppender LOG_APPENDER_INSTANCE = null; + + public String getPrefix() { + return prefix; + } + + public void setPrefix(String prefix) { + this.prefix = prefix; + } + @Override + protected void append(ILoggingEvent event) { + if (prefix == null || "".equals(prefix)) { + addError("Prefix is not set for LogAppender."); + return; + } + eventMap.put(prefix + System.currentTimeMillis(), event); + } + + public LogAppender createInstance() { + if (LOG_APPENDER_INSTANCE == null) { + LOG_APPENDER_INSTANCE = new LogAppender(); + } + return LOG_APPENDER_INSTANCE; + } + + public void putEvent(String key, String value) { + eventMap.put(key, value); + } + public Map getEventMap() { + return eventMap; + } +} diff --git a/src/main/java/pro/litvinovg/xml/Debug.java b/src/main/java/pro/litvinovg/xml/Debug.java index 1667acc..27026f5 100644 --- a/src/main/java/pro/litvinovg/xml/Debug.java +++ b/src/main/java/pro/litvinovg/xml/Debug.java @@ -8,9 +8,6 @@ import org.w3c.dom.ls.LSSerializer; import com.sun.star.uno.XComponentContext; -import pro.litvinovg.w2phtml.DialogHelper; - - public class Debug { public static void printNode(Node node){ Document document = node.getOwnerDocument(); @@ -26,11 +23,4 @@ public class Debug { } } - public static void printLog(String message, XComponentContext context) { - if (context != null) { - DialogHelper.showErrorMessage(context, null, message); - } else { - System.out.println(message); - } - } } diff --git a/src/main/java/w2phtml/Application.java b/src/main/java/w2phtml/Application.java index f4a989e..6614f5d 100644 --- a/src/main/java/w2phtml/Application.java +++ b/src/main/java/w2phtml/Application.java @@ -22,7 +22,7 @@ * Version 1.6 (2015-01-09) * */ - + package w2phtml; import java.io.ByteArrayInputStream; @@ -37,6 +37,9 @@ import java.util.Hashtable; import java.util.Set; import java.util.Vector; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import pro.litvinovg.w2phtml.gui.ConfigurationWindow; import w2phtml.api.Converter; import w2phtml.api.ConverterFactory; @@ -44,363 +47,340 @@ import w2phtml.api.ConverterResult; import w2phtml.api.MIMETypes; import w2phtml.util.Misc; -/** - *

Command line utility to convert an OpenOffice.org Writer XML file into XHTML/LaTeX/BibTeX

- *

The utility is invoked with the following command line:

- * 
java -jar writer2latex.jar [options] source [target]
- *

Where the available options are - *

    - *
  • -html5, -xhtml, - -xhtml+mathml, -epub, -epub3 - *
  • -recurse - *
  • -ultraclean, -clean, -pdfscreen, - * -pdfprint, -cleanxhtml - *
  • -config[=]filename - *
  • -template[=]filename - *
  • -stylesheet[=]filename - *
  • -resource[=]filename[::media type] - *
  • -option[=]value - *
- *

where option can be any simple option known to Writer2LaTeX - * (see documentation for the configuration file).

- */ public final class Application { - - /* Based on command-line parameters. */ - private String sTargetMIME = MIMETypes.HTML5; - private Vector configFileNames = new Vector(); - private String sTemplateFileName = null; - private String sStyleSheetFileName = null; - private Set resources = new HashSet(); - private Hashtable options = new Hashtable(); - private String sSource = null; - private String sTarget = null; - /** - * Main method - * - * @param args The argument passed on the command line. - */ - public static final void main (String[] args){ - if (args.length == 0) { - showUsage(""); - ConfigurationWindow.runGUI(null); - } else { - try { - //long time = System.currentTimeMillis(); - Application app = new Application(); - app.parseCommandLine(args); - app.doConversion(); - //System.out.println("Total conversion time was "+(System.currentTimeMillis()-time)+" miliseconds"); - } catch (IllegalArgumentException ex) { - String msg = ex.getMessage(); - showUsage(msg); - } - } - - } - - // Convert the directory or file - private void doConversion() { - sayHello(); - File source = new File(sSource); - examineSource(source); + private static final Logger logger = LoggerFactory.getLogger(Application.class); + /* Based on command-line parameters. */ + private String sTargetMIME = MIMETypes.HTML5; + private Vector configFileNames = new Vector(); + private String sTemplateFileName = null; + private String sStyleSheetFileName = null; + private Set resources = new HashSet(); + private Hashtable options = new Hashtable(); + private String sSource = null; + private String sTarget = null; - // Step 3: Examine target - File target; - target = examineTarget(source); - - // Step 4: Create converters - Converter converter = ConverterFactory.createConverter(sTargetMIME); - if (converter==null) { - System.out.println("Failed to create converter for "+sTargetMIME); - System.exit(1); - } - - - // Step 5a: Read template - if (sTemplateFileName!=null) { - try { - System.out.println("Reading template "+sTemplateFileName); - byte [] templateBytes = Misc.inputStreamToByteArray(new FileInputStream(sTemplateFileName)); - converter.readTemplate(new ByteArrayInputStream(templateBytes)); - } - catch (FileNotFoundException e) { - System.out.println("--> This file does not exist!"); - System.out.println(" "+e.getMessage()); - } - catch (IOException e) { - System.out.println("--> Failed to read the template file!"); - System.out.println(" "+e.getMessage()); - } - } - - // Step 5b: Read style sheet - if (sStyleSheetFileName!=null) { - try { - System.out.println("Reading style sheet "+sStyleSheetFileName); - byte [] styleSheetBytes = Misc.inputStreamToByteArray(new FileInputStream(sStyleSheetFileName)); - converter.readStyleSheet(new ByteArrayInputStream(styleSheetBytes)); - } - catch (FileNotFoundException e) { - System.out.println("--> This file does not exist!"); - System.out.println(" "+e.getMessage()); - } - catch (IOException e) { - System.out.println("--> Failed to read the style sheet file!"); - System.out.println(" "+e.getMessage()); - } - } - - // Step 5c: Read style resources - for (String sResource : resources) { - String sMediaType; - String sFileName; - int nSeparator = sResource.indexOf("::"); - if (nSeparator>-1) { - sFileName = sResource.substring(0,nSeparator); - sMediaType = sResource.substring(nSeparator+2); - } - else { - sFileName = sResource; - sMediaType = null; - } - System.out.println("Reading resource file "+sFileName); - try { - byte [] resourceBytes = Misc.inputStreamToByteArray(new FileInputStream(sFileName)); - converter.readResource(new ByteArrayInputStream(resourceBytes),sFileName,sMediaType); - } catch (IOException e) { - System.out.println("--> Failed to read the resource file!"); - System.out.println(" "+e.getMessage()); - } - - } - - // Step 6: Read config - for (int i=0; i This configuration is unknown!"); - System.out.println(" "+e.getMessage()); - } - } - else { - System.out.println("Reading configuration file "+sConfigFileName); - try { - byte[] configBytes = Misc.inputStreamToByteArray(new FileInputStream(sConfigFileName)); - converter.getConfig().read(new ByteArrayInputStream(configBytes)); + /** + * Main method + * + * @param args + * The argument passed on the command line. + */ + public static final void main(String[] args) throws Exception { + if (args.length == 0) { + showUsage(""); + ConfigurationWindow.runGUI(null); + } else { + try { + long time = System.currentTimeMillis(); + Application app = new Application(); + app.parseCommandLine(args); + app.doConversion(); + logger.debug("Total conversion time was " + (System.currentTimeMillis() - time) + " miliseconds"); + } catch (IllegalArgumentException ex) { + String msg = ex.getMessage(); + showUsage(msg); + } + } - } - catch (IOException e) { - System.err.println("--> Failed to read the configuration!"); - System.out.println(" "+e.getMessage()); - } - } - } - - // Step 7: Set options from command line - Enumeration keys = options.keys(); - while (keys.hasMoreElements()) { - String sKey = keys.nextElement(); - String sValue = (String) options.get(sKey); - converter.getConfig().setOption(sKey,sValue); - } - - // Step 8: Perform conversion + } - - System.out.println("Converting "+source.getPath()); - ConverterResult dataOut = null; + // Convert the directory or file + private void doConversion() throws Exception { + sayHello(); + File source = new File(sSource); + examineSource(source); - try { - dataOut = converter.convert(source,target.getName()); - } - catch (FileNotFoundException e) { - System.out.println("--> The file "+source.getPath()+" does not exist!"); - System.out.println(" "+e.getMessage()); - System.exit(1); - } - catch (IOException e) { - System.out.println("--> Failed to convert the file "+source.getPath()+"!"); - System.out.println(" "+e.getMessage()); - System.out.println(" Please make sure the file is in OpenDocument format"); - System.exit(1); - } + // Step 3: Examine target + File target; + target = examineTarget(source); - // TODO: Should do some further checking on the feasability of writing - // the directory and the files. - File targetDir = target.getParentFile(); - if (targetDir!=null && !targetDir.exists()) { targetDir.mkdirs(); } - try { - dataOut.write(targetDir); - } - catch (IOException e) { - System.out.println("--> Error writing out file!"); - System.out.println(" "+e.getMessage()); - System.exit(1); - } - - - - // Step 9: Say goodbye! - System.out.println("Done!"); - } + // Step 4: Create converters + Converter converter = ConverterFactory.createConverter(sTargetMIME); + if (converter == null) { + logger.error("Failed to create converter for " + sTargetMIME); + throw new Exception("Conversion failed."); + } - private File examineTarget(File source) { - File target; + // Step 5a: Read template + if (sTemplateFileName != null) { + try { + logger.info("Reading template " + sTemplateFileName); + byte[] templateBytes = Misc.inputStreamToByteArray(new FileInputStream(sTemplateFileName)); + converter.readTemplate(new ByteArrayInputStream(templateBytes)); + } catch (FileNotFoundException e) { + logger.error("--> This file does not exist!"); + logger.error(" " + e.getMessage()); + } catch (IOException e) { + logger.error("--> Failed to read the template file!"); + logger.error(" " + e.getMessage()); + } + } - if (sTarget == null) { - target = new File(source.getParent(), Misc.removeExtension(source.getName())); + // Step 5b: Read style sheet + if (sStyleSheetFileName != null) { + try { + logger.info("Reading style sheet " + sStyleSheetFileName); + byte[] styleSheetBytes = Misc.inputStreamToByteArray(new FileInputStream(sStyleSheetFileName)); + converter.readStyleSheet(new ByteArrayInputStream(styleSheetBytes)); + } catch (FileNotFoundException e) { + logger.error("--> This file does not exist!"); + logger.error(" " + e.getMessage()); + } catch (IOException e) { + logger.error("--> Failed to read the style sheet file!"); + logger.error(" " + e.getMessage()); + } + } + + // Step 5c: Read style resources + for (String sResource : resources) { + String sMediaType; + String sFileName; + int nSeparator = sResource.indexOf("::"); + if (nSeparator > -1) { + sFileName = sResource.substring(0, nSeparator); + sMediaType = sResource.substring(nSeparator + 2); } else { - target = new File(sTarget); - if (sTarget.endsWith(File.separator)) { - target = new File(target, Misc.removeExtension(source.getName())); + sFileName = sResource; + sMediaType = null; + } + logger.info("Reading resource file " + sFileName); + try { + byte[] resourceBytes = Misc.inputStreamToByteArray(new FileInputStream(sFileName)); + converter.readResource(new ByteArrayInputStream(resourceBytes), sFileName, sMediaType); + } catch (IOException e) { + logger.error("--> Failed to read the resource file!"); + logger.error(" " + e.getMessage()); + } + + } + + // Step 6: Read config + for (int i = 0; i < configFileNames.size(); i++) { + String sConfigFileName = (String) configFileNames.get(i); + if (sConfigFileName.startsWith("*")) { + sConfigFileName = sConfigFileName.substring(1); + logger.info("Reading default configuration " + sConfigFileName); + try { + converter.getConfig().readDefaultConfig(sConfigFileName); + } catch (IllegalArgumentException e) { + logger.error("--> This configuration is unknown!"); + logger.error(" " + e.getMessage()); + } + } else { + logger.info("Reading configuration file " + sConfigFileName); + try { + byte[] configBytes = Misc.inputStreamToByteArray(new FileInputStream(sConfigFileName)); + converter.getConfig().read(new ByteArrayInputStream(configBytes)); + + } catch (IOException e) { + logger.error("--> Failed to read the configuration!"); + logger.error(" " + e.getMessage()); } } - - return target; } - private void examineSource(File source) { - if (!source.exists()) { - System.out.println("I'm sorry, I can't find "+sSource); - System.exit(1); - } - if (!source.canRead()) { - System.out.println("I'm sorry, I can't read "+sSource); - System.exit(1); + // Step 7: Set options from command line + Enumeration keys = options.keys(); + while (keys.hasMoreElements()) { + String sKey = keys.nextElement(); + String sValue = (String) options.get(sKey); + converter.getConfig().setOption(sKey, sValue); + } + + // Step 8: Perform conversion + + logger.info("Converting " + source.getPath()); + ConverterResult dataOut = null; + + try { + dataOut = converter.convert(source, target.getName()); + } catch (FileNotFoundException e) { + logger.error("--> The file " + source.getPath() + " does not exist!"); + logger.error(" " + e.getMessage()); + throw new Exception("Conversion failed."); + } catch (IOException e) { + logger.error("--> Failed to convert the file " + source.getPath() + "!"); + logger.error(" " + e.getMessage()); + logger.error(" Please make sure the file is in OpenDocument format"); + throw new Exception("Conversion failed."); + } + + // TODO: Should do some further checking on the feasability of writing + // the directory and the files. + File targetDir = target.getParentFile(); + if (targetDir != null && !targetDir.exists()) { + targetDir.mkdirs(); + } + try { + dataOut.write(targetDir); + } catch (IOException e) { + logger.error("--> Error writing out file!"); + logger.error(" " + e.getMessage()); + throw new Exception("Conversion failed."); + } + + // Step 9: Say goodbye! + logger.info("Done!"); + } + + private File examineTarget(File source) { + File target; + + if (sTarget == null) { + target = new File(source.getParent(), Misc.removeExtension(source.getName())); + } else { + target = new File(sTarget); + if (sTarget.endsWith(File.separator)) { + target = new File(target, Misc.removeExtension(source.getName())); } } - private void sayHello() { - System.out.println(); - System.out.println("This is w2phtml, Version " + ConverterFactory.getVersion() + - " (" + ConverterFactory.getDate() + ")"); - System.out.println(); - System.out.println("Starting conversion..."); + return target; + } + + private void examineSource(File source) throws Exception { + if (!source.exists()) { + logger.error("I'm sorry, I can't find " + sSource); + throw new Exception("Conversion failed."); } + if (!source.canRead()) { + logger.error("I'm sorry, I can't read " + sSource); + throw new Exception("Conversion failed."); + } + } + private void sayHello() { + logger.info("This is w2phtml, Version " + ConverterFactory.getVersion() + " (" + ConverterFactory.getDate() + ")"); + logger.info("Starting conversion..."); + } - /** - * Display usage. - */ - private static void showUsage(String msg) { - System.out.println(); - System.out.println("This is w2phtml, Version " + ConverterFactory.getVersion() - + " (" + ConverterFactory.getDate() + ")"); - System.out.println(); - if (msg != null) System.out.println(msg); - System.out.println(); - System.out.println("Usage:"); - System.out.println(" java -jar /w2phtml.jar []"); - System.out.println("where the available options are:"); - System.out.println(" -xhtml"); - System.out.println(" -xhtml11"); - System.out.println(" -xhtml+mathml"); - System.out.println(" -html5"); - System.out.println(" -epub"); - System.out.println(" -epub3"); - System.out.println(" -template[=]