lib/Plugins/Bugzilla: generate less sparse bug report comments

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

3 files changed, 99 insertions, 10 deletions

diff --git a/lib/Utils/Makefile.am b/lib/Utils/Makefile.am
index 3c510851..7823b4d4 100644
--- a/lib/Utils/Makefile.am
+++ b/lib/Utils/Makefile.am
@@ -15,7 +15,7 @@ libABRTUtils_la_SOURCES = \
     DebugDump.h DebugDump.cpp \
     CommLayerInner.h CommLayerInner.cpp \
     abrt_dbus.h abrt_dbus.cpp \
-    Plugin.h Plugin.cpp \
+    Plugin.h Plugin.cpp make_descr.cpp \
     Polkit.h Polkit.cpp \
     Action.h Database.h Reporter.h Analyzer.h \
     Observer.h \
diff --git a/lib/Utils/Plugin.h b/lib/Utils/Plugin.h
index 39290231..eabfa10d 100644
--- a/lib/Utils/Plugin.h
+++ b/lib/Utils/Plugin.h
@@ -24,17 +24,10 @@
 #define PLUGIN_H_
 
 #include "abrt_types.h"
-
-#define PLUGINS_MAGIC_NUMBER 6
-
-#define PLUGINS_CONF_EXTENSION "conf"
-#define PLUGINS_LIB_EXTENSION "so"
-#define PLUGINS_LIB_PREFIX "lib"
-
+#include "CrashTypes.h"
 #if HAVE_CONFIG_H
     #include <config.h>
 #endif
-
 #if ENABLE_NLS
     #include <libintl.h>
     #define _(S) gettext(S)
@@ -42,6 +35,12 @@
     #define _(S) (S)
 #endif
 
+#define PLUGINS_MAGIC_NUMBER 6
+
+#define PLUGINS_CONF_EXTENSION "conf"
+#define PLUGINS_LIB_EXTENSION "so"
+#define PLUGINS_LIB_PREFIX "lib"
+
 /**
  * An abstract class. The class defines a common plugin interface. If a plugin
  * has some settings, then a *Settings(*) method has to be written.
@@ -115,4 +114,7 @@ typedef struct SPluginInfo
         PLUGINS_MAGIC_NUMBER,\
     };
 
-#endif /* PLUGIN_H_ */
+/* helper finctions */
+std::string make_description_bz(const map_crash_report_t& pCrashReport);
+
+#endif
diff --git a/lib/Utils/make_descr.cpp b/lib/Utils/make_descr.cpp
new file mode 100644
index 00000000..8f1c8617
--- /dev/null
+++ b/lib/Utils/make_descr.cpp
@@ -0,0 +1,87 @@
+#include "abrtlib.h"
+//#include "abrt_types.h"
+#include "CrashTypes.h"
+#include "DebugDump.h" /* FILENAME_ARCHITECTURE etc */
+
+using namespace std;
+
+static void add_content(bool &was_multiline, string& description, const char *header, const char *content)
+{
+    /* We separate multiline contents with emply line */
+    if (was_multiline)
+        description += '\n';
+
+    description += header;
+
+    while (content[0] == '\n')
+        content++;
+
+    if (strchr(content, '\n') == NULL)
+    {
+        /* one string value, like OS release */
+        description += ": ";
+        description += content;
+        description += '\n';
+        was_multiline = 0;
+    }
+    else
+    {
+        /* multi-string value, like backtrace */
+        description += "\n-----\n";
+        description += content;
+        if (content[strlen(content) - 1] != '\n')
+            description += '\n';
+        was_multiline = 1;
+    }
+}
+
+string make_description_bz(const map_crash_report_t& pCrashReport)
+{
+    string description;
+
+    map_crash_report_t::const_iterator it;
+    map_crash_report_t::const_iterator end = pCrashReport.end();
+
+    bool was_multiline = 0;
+    it = pCrashReport.find(CD_REPRODUCE);
+    if (it != end && it->second[CD_CONTENT] != "1.\n2.\n3.\n")
+    {
+        add_content(was_multiline, description, "How to reproduce", it->second[CD_CONTENT].c_str());
+    }
+
+    it = pCrashReport.find(CD_COMMENT);
+    if (it != end)
+    {
+        add_content(was_multiline, description, "Comment", it->second[CD_CONTENT].c_str());
+    }
+
+    it = pCrashReport.begin();
+    for (; it != end; it++)
+    {
+        const string &filename = it->first;
+        const string &type = it->second[CD_TYPE];
+        const string &content = it->second[CD_CONTENT];
+        if (type == CD_TXT)
+        {
+            if (filename != CD_UUID
+             && filename != FILENAME_ARCHITECTURE
+             && filename != FILENAME_RELEASE
+             && filename != CD_REPRODUCE
+             && filename != CD_COMMENT
+	    ) {
+                add_content(was_multiline, description, filename.c_str(), content.c_str());
+            }
+        }
+        else if (type == CD_ATT)
+        {
+            add_content(was_multiline, description, "Attached file", filename.c_str());
+        }
+        //else if (type == CD_BIN)
+        //{
+        //    string msg = ssprintf(_("Binary file %s is not reported"), filename.c_str());
+        //    warn_client(msg);
+        //}
+    }
+
+    return description;
+}