Ticket #13952: 0001-Icon-O-Matic-convert-IOM-to-HVIF-SVG-from-command-li.patch

src/apps/icon-o-matic/IconEditorApp.cpp

@@ -6 +6 @@
 
 #include "IconEditorApp.h"
 
+#include "Document.h"
+#include "FlatIconExporter.h"
+#include "Icon.h"
+#include "MessageImporter.h"
+#include "SimpleFileSaver.h"
+#include "SVGExporter.h"
+
 #include <new>
 #include <stdio.h>
 #include <string.h>
@@ -32 +39 @@
 #define B_TRANSLATION_CONTEXT "Icon-O-Matic-Main"
 
 
+extern int exitCode;
+
+
 using std::nothrow;
 
 static const char* kAppSig = "application/x-vnd.haiku-icon_o_matic";
 
 static const float kWindowOffset = 20;
 
+static bool isCLI;
+
 
 IconEditorApp::IconEditorApp()
     :
     BApplication(kAppSig),
-    fWindowCount(0),
-    fLastWindowFrame(50, 50, 900, 750),
 
     fOpenPanel(NULL),
-    fSavePanel(NULL),
+    fSavePanel(NULL)
+{
+}
 
-    fLastOpenPath(""),
-    fLastSavePath(""),
-    fLastExportPath("")
+
+void
+IconEditorApp::_Init()
 {
+    fWindowCount = 0;
+    fLastWindowFrame.Set(50, 50, 900, 750);
+
+    fLastOpenPath = "";
+    fLastSavePath = "";
+    fLastExportPath = "";
+
     // create file panels
     BMessenger messenger(this, this);
     BMessage message(B_REFS_RECEIVED);
@@ -68 +87 @@
 
 IconEditorApp::~IconEditorApp()
 {
-    delete fOpenPanel;
-    delete fSavePanel;
+    if (fOpenPanel != NULL)
+        delete fOpenPanel;
+
+    if (fSavePanel != NULL)
+        delete fSavePanel;
 }
 
 
@@ -79 +101 @@
 bool
 IconEditorApp::QuitRequested()
 {
+    if (isCLI)
+        return true;
+
     // Run the QuitRequested() hook in each window's own thread. Otherwise
     // the BAlert which a window shows when an icon is not saved will not
     // repaint the window. (BAlerts check which thread is running Go() and
@@ -202 +227 @@
 void
 IconEditorApp::ReadyToRun()
 {
+    if (isCLI)
+        return;
+
+    _Init();
+
     // create main window
     if (fWindowCount == 0)
         _NewWindow()->Show();
@@ -248 +278 @@
 }
 
 
+static status_t
+ConvertIcon(const char* from, const char* to, const char* format)
+{
+    uint32 exportMode;
+    if (strcmp(format, "-h") == 0)
+        exportMode = EXPORT_MODE_FLAT_ICON;
+    else if (strcmp(format, "-s") == 0)
+        exportMode = EXPORT_MODE_SVG;
+    else
+        return B_ERROR;
+
+    entry_ref ref;
+    status_t ret = get_ref_for_path(from, &ref);
+    if (ret != B_OK)
+        return ret;
+
+    BFile file(&ref, B_READ_ONLY);
+    ret = file.InitCheck();
+    if (ret < B_OK)
+        return ret;
+
+    ret = get_ref_for_path(to, &ref);
+    if (ret != B_OK)
+        return ret;
+
+    Icon* icon = new (nothrow) Icon();
+    if (icon == NULL)
+        return B_ERROR;
+
+    MessageImporter msgImporter;
+    ret = msgImporter.Import(icon, &file);
+    if (ret < B_OK) {
+        delete icon;
+        return ret;
+    }
+
+    DocumentSaver* saver = NULL;
+    switch (exportMode) {
+        case EXPORT_MODE_FLAT_ICON:
+            saver = new SimpleFileSaver(new FlatIconExporter(), ref);
+            break;
+        case EXPORT_MODE_SVG:
+            saver = new SimpleFileSaver(new SVGExporter(), ref);
+            break;
+    }
+
+    if (saver == NULL) {
+        delete icon;
+        return B_ERROR;
+    }
+
+    Document* document = new Document(to);
+    if (document == NULL) {
+        delete icon;
+        return B_ERROR;
+    }
+
+    document->SetIcon(icon);
+    document->SetExportSaver(saver);
+    saver->Save(document);
+
+    return B_OK;
+}
+
+
 void
 IconEditorApp::ArgvReceived(int32 argc, char** argv)
 {
     if (argc < 2)
         return;
 
+    // Usage: Icon-O-Matic -[h|s] -o output_file IOM_file
+    if (argc > 4 && strcmp(argv[2], "-o") == 0) {
+        isCLI = true;
+        exitCode = ConvertIcon(argv[4], argv[3], argv[1]);
+        PostMessage(B_QUIT_REQUESTED);
+        return;
+    }
+
     entry_ref ref;
 
     for (int32 i = 1; i < argc; i++) {

src/apps/icon-o-matic/IconEditorApp.h

@@ -60 +60 @@
     // IconEditorApp
 
 private:
+            void                _Init();
+
             MainWindow*         _NewWindow();
 
             void                _SyncPanels(BFilePanel* from,

src/apps/icon-o-matic/main.cpp

@@ -8 +8 @@
 
 #include "IconEditorApp.h"
 
+int exitCode;
+
 int
 main(int argc, char** argv)
 {
@@ -16 +18 @@
 
     delete app;
 
-    return 0;
+    return exitCode;
 }