From 2745d513e0d6d2e2763bdbe441775be880bb443c Mon Sep 17 00:00:00 2001
From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Wed, 1 Feb 2017 17:30:34 +0300
Subject: [PATCH] Fixed release download

---
 BuildServer/routes/release.js | 32 +++-----------------------------
 1 file changed, 3 insertions(+), 29 deletions(-)

diff --git a/BuildServer/routes/release.js b/BuildServer/routes/release.js
index 2fc54e5..8bd6507 100644
--- a/BuildServer/routes/release.js
+++ b/BuildServer/routes/release.js
@@ -4,31 +4,7 @@ const path = require("path");
 const fs = require("fs");
 const Archiver = require("archiver");
 
-const getReport = (releasePath, callback) => {
-    const reportFile = `${releasePath}report.json`;
-
-    fs.exists(reportFile, (exists) => {
-        if (!exists) {
-            return callback(`ReportFileNotFound: ${reportFile}`);
-        }
-
-        return fs.readFile(reportFile, (err, dataBuffer) => {
-            if (err) {
-                return callback(err, reportFile);
-            }
-
-            const data = dataBuffer.toString();
-
-            if (!data) {
-                return callback("ReportFileNotFound", reportFile);
-            }
-
-            const report = JSON.parse(data);
-
-            return callback(null, report);
-        });
-    });
-};
+const reportProcessor = require("../lib/report-processor");
 
 const getDatePart = (report) => {
     if (!report.date) {
@@ -57,11 +33,9 @@ module.exports = (req, res, next) => {
         "rev": req.params.rev
     };
 
-    const releasePathParts = [req.app.get("releasepath"), options.owner, options.reponame, options.branch, options.rev, ""];
-
-    const releasePath = path.normalize(releasePathParts.join("/"));
+    const releasePath = path.join(req.app.get("releasepath"), options.owner, options.reponame, options.branch, options.rev);
 
-    getReport(releasePath, (err, report) => {
+    reportProcessor.readReport(releasePath, (err, report) => {
         if (err) {
             return next(err);
         }