fix(atarashi): Fix the wrapper for atarashi

Signed-off-by: Gaurav Mishra <mishra.gaurav@siemens.com>

.gitignore

@@ -27,6 +27,7 @@ install/defconf/Db.conf
 install/defconf/fossology.conf
 install/fo-postinstall
 src/adj2nest/agent/adj2nest
+src/atarashi/agent/atarashiWrapper
 src/buckets/agent/buckets
 src/cli/cp2foss
 src/cli/cp2foss.1
@@ -151,8 +152,6 @@ src/reportImport/agent/reportImport
 /install/scripts/php.ini
 /install/scripts/php.ini.orig
 /install/db/dbmigrate_pfile_calculate_sha256.php
-/src/ninka/agent/atarashiWrapper
-/src/ninka/agent/atarashi
 
 # Add all the Ubuntu consol log file
 ubuntu-*

src/Makefile

@@ -11,6 +11,7 @@ include $(VARS)
 DIRS = \
 	adj2nest \
 	buckets \
+	atarashi \
 	cli \
 	copyright \
 	debug \

src/atarashi/Makefile

@@ -16,11 +16,10 @@ TESTDIR = agent_tests
 
 DIR_LOOP = @set -e; for dir in $(DIRS); do $(MAKE) -s -C $$dir $(1); done
 
-all: VERSIONFILE atarashi-all
+all: VERSIONFILE
 	$(call DIR_LOOP, )
 
 test: all
-	# $(TOP)/install/scripts/install-atarashi.sh
 	$(MAKE) -C $(TESTDIR) test
 
 coverage: all
@@ -48,4 +47,3 @@ clean:
 	rm -f VERSION
 
 .PHONY: all test coverage VERSIONFILE install uninstall clean
-.PHONY: atarashi-all atarashi-install atarashi-uninstall atarashi-clean atarashi-Makefile

src/atarashi/agent/atarashiwrapper.cc

@@ -44,5 +44,30 @@ string scanFileWithAtarashi(const State& state, const fo::File& file)
     bail(1);
   }
 
-  return result;
+  int jsonStart = result.find("{");
+  return result.substr(jsonStart, string::npos);
+}
+
+vector<LicenseMatch> extractLicensesFromAtarashiResult(string atarashiResult)
+{
+  Json::Reader reader;
+  Json::Value atarashiResultobj;
+  bool parseSuccess = reader.parse(atarashiResult, atarashiResultobj);
+
+  if (!parseSuccess)
+  {
+    cout << "Failed to parse" << reader.getFormattedErrorMessages();
+    bail(-30);
+  }
+
+  vector<LicenseMatch> matches;
+  Json::Value resultArray = atarashiResultobj["results"];
+  for (unsigned int index = 0; index < resultArray.size(); ++index)
+  {
+    Json::Value resultObject = resultArray[index];
+    LicenseMatch m(resultObject["shortname"].asString(),
+        (unsigned)(resultObject["sim_score"].asDouble() * 100.0));
+    matches.push_back(m);
+  }
+  return matches;
 }

src/atarashi/agent/atarashiwrapper.hpp

@@ -18,18 +18,16 @@
 #ifndef ATARASHI_AGENT_ATARASHI_WRAPPER_HPP
 #define ATARASHI_AGENT_ATARASHI_WRAPPER_HPP
 
-#define AGENT_NAME "atarashi"
-#define AGENT_DESC "atarashi agent"
-#define AGENT_ARS  "atarashi_ars"
-
 #include <string>
 #include <vector>
+#include <jsoncpp/json/json.h>
+
 #include "files.hpp"
 #include "licensematch.hpp"
 #include "state.hpp"
 
 using namespace std;
 
 string scanFileWithAtarashi(const State& state, const fo::File& file);
-
+vector<LicenseMatch> extractLicensesFromAtarashiResult(string atarashiResult);
 #endif // ATARASHI_AGENT_ATARASHI_WRAPPER_HPP

src/atarashi/agent/utils.cc

@@ -18,7 +18,6 @@
 #include <iostream>
 #include "atarashiwrapper.hpp"
 #include "utils.hpp"
-#include <jsoncpp/json/json.h>
 
 using namespace fo;
 
@@ -142,15 +141,7 @@ vector<LicenseMatch> createMatches(std::string liscenceName, unsigned percentage
 bool matchFileWithLicenses(const State& state, const fo::File& file, AtarashiDatabaseHandler& databaseHandler)
 {
   string atarashiResult = scanFileWithAtarashi(state, file);
-  Json::Reader reader;
-  Json::Value obj;
-  reader.parse(atarashiResult, obj);
-
-  Json::StreamWriterBuilder builder;
-  builder.settings_["indentation"] = "";
-  std::string liscenceName = Json::writeString(builder, obj['results'][0]['shortname']);
-  unsigned percentage = obj['results'][0]['sim_score'].asInt();
-  vector<LicenseMatch> matches = createMatches(liscenceName, percentage);
+  vector<LicenseMatch> matches = extractLicensesFromAtarashiResult(atarashiResult);
   return saveLicenseMatchesToDatabase(state, matches, file.getId(), databaseHandler);
 }
 

src/atarashi/agent/utils.hpp

@@ -18,9 +18,9 @@
 #ifndef ATARASHI_AGENT_UTILS_HPP
 #define ATARASHI_AGENT_UTILS_HPP
 
-#define AGENT_NAME "atarashi"
+#define AGENT_NAME "atarashiWrapper"
 #define AGENT_DESC "atarashi agent"
-#define AGENT_ARS  "atarashi_ars"
+#define AGENT_ARS  "atarashiWrapper_ars"
 
 #include <string>
 #include <vector>

src/atarashi/ui/agent-atarashi.php

@@ -26,7 +26,6 @@ public function __construct() {
     $this->Name = "agent_atarashi";
     $this->Title =  _("atarashi License Analysis");
     $this->AgentName = "atarashiWrapper";
-
 
     parent::__construct();
   }
@@ -35,19 +34,19 @@ function AgentHasResults($uploadId=0)
   {
     return CheckARS($uploadId, $this->AgentName, "atarashi agent", "atarashi_ars");
   }
-  
+
   function preInstall()
   {
     if ($this->isAtarashiInstalled()) {
       menu_insert("Agents::" . $this->Title, 0, $this->Name);
     }
   }
-  
+
   public function isAtarashiInstalled()
   {
     exec('which atarashi', $lines, $returnVar);
     return (0==$returnVar);
   }
 }
 
-register_plugin(new AtarashiAgentPlugin());
+register_plugin(new AtarashiAgentPlugin());

src/www/ui/async/AjaxExplorer.php

@@ -64,7 +64,7 @@ class AjaxExplorer extends DefaultPlugin
   /** @var array [uploadtree_id]=>cnt */
   private $filesToBeCleared;
   /** @var array */
-  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I');
+  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I', 'atarashiWrapper' => 'A');
 
   public function __construct()
   {

src/www/ui/async/AjaxFileBrowser.php

@@ -52,7 +52,7 @@ class AjaxFileBrowser extends DefaultPlugin
   /** @var LicenseMap */
   private $licenseProjector;
   /** @var array */
-  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I');
+  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I', 'atarashiWrapper' => 'A');
 
   public function __construct()
   {

src/www/ui/template/browse_file.js.twig

@@ -27,7 +27,7 @@ function createDirlistTable() {
         }
     },
     "aoColumns": [{"sTitle":"Files","sClass":"left"},
-        {"sTitle":"Scanner Results (N: nomos, M: monk, Nk: ninka, I: reportImport)","sClass":"left","bSortable":false},
+        {"sTitle":"Scanner Results (N: nomos, M: monk, Nk: ninka, I: reportImport, A: atarashiWrapper)","sClass":"left","bSortable":false},
         {"sTitle":"Edited Results","sClass":"left","bSortable":false},
         {"sTitle":"Clearing Status","sClass":"clearingStatus center","bSortable":false,"bSearchable":false,"sWidth":"5%","mRender":function ( data, type, full ) {
             if(type!='display') return data;

src/www/ui/template/file-browse.js.twig

@@ -25,7 +25,7 @@ function createDirlistTable() {
         }
     },
     "aoColumns": [{"sTitle":"Files","sClass":"left"},
-        {"sTitle":"Scanner Results (N: nomos, M: monk, Nk: ninka, I: reportImport)","sClass":"left","bSortable":false},
+        {"sTitle":"Scanner Results (N: nomos, M: monk, Nk: ninka, I: reportImport, A: atarashiWrapper)","sClass":"left","bSortable":false},
         {"sTitle":"Actions","sClass":"left","bSortable":false,"bSearchable":false}],
     "sPaginationType": "listbox",
     "iDisplayLength": 25,

src/www/ui/template/ui-browse-license_file-list.js.twig

@@ -8,7 +8,7 @@ function createDirlistTable() {
   $('#dirlist').dataTable( {
     "aaData": {{ aaData }},
     "aoColumns":[{"sTitle":"Files","sClass":"left"},
-      {"sTitle":"Scanner Results (N: nomos, M: monk, Nk: ninka, I: reportImport)","sClass":"left"},
+      {"sTitle":"Scanner Results (N: nomos, M: monk, Nk: ninka, I: reportImport, A: atarashiWrapper)","sClass":"left"},
       {"sTitle":"Edited Results","sClass":"left"},
       {"sTitle":"Clearing Status","sClass":"clearingStatus center","bSearchable":false,"sWidth":"5%","mRender":function ( data, type, full ) {
           if(type!='display') return data;

src/www/ui/ui-browse-license.php

@@ -55,7 +55,7 @@ class ui_browse_license extends DefaultPlugin
   /** @var LicenseMap */
   private $licenseProjector;
   /** @var array */
-  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I');
+  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I', 'atarashiWrapper' => 'A');
 
   public function __construct()
   {

src/www/ui/ui-file-browse.php

@@ -48,7 +48,7 @@ class ui_file_browse extends DefaultPlugin
   /** @var LicenseMap */
   private $licenseProjector;
   /** @var array */
-  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I');
+  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I', 'atarashiWrapper' => 'A');
 
   public function __construct()
   {

src/www/ui/ui-license-list-files.php

@@ -45,7 +45,7 @@ class LicenseListFiles extends FO_Plugin
   private $agentDao;
 
   /** @var Array */
-  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I');
+  protected $agentNames = array('nomos' => 'N', 'monk' => 'M', 'ninka' => 'Nk', 'reportImport' => 'I', 'atarashiWrapper' => 'A');
 
   function __construct()
   {