From 717659aab36e9a90032b445a210fa2a8f5957368 Mon Sep 17 00:00:00 2001
From: Inga Lovinde <52715130+inga-lovinde@users.noreply.github.com>
Date: Thu, 20 Feb 2014 19:12:37 +0400
Subject: [PATCH] Added artifact subfolders support

---
 BuildServer/routes/status.js  | 5 +++--
 BuildServer/views/status.jade | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/BuildServer/routes/status.js b/BuildServer/routes/status.js
index 747ada6..90d9687 100644
--- a/BuildServer/routes/status.js
+++ b/BuildServer/routes/status.js
@@ -1,7 +1,8 @@
 "use strict";
 
 var fs = require('fs'),
-	url = require('url');
+	url = require('url'),
+	glob = require('glob');
 
 var addBranchInfo = function (app, options, callback) {
 	var branchFile = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/$revs/" + options.rev + ".branch";
@@ -58,7 +59,7 @@ var parseOptionsFromReferer = function (req, callback) {
 var loadReport = function (app, options, callback) {
 	var releaseDir = app.get('releasepath') + "/" + options.owner + "/" + options.reponame + "/" + options.branch + "/" + options.rev;
 
-	fs.readdir(releaseDir, function (err, files) {
+	glob("**", {cwd: releaseDir, mark: true}, function (err, files) {
 		if (err) {
 			return callback(err, options);
 		}
diff --git a/BuildServer/views/status.jade b/BuildServer/views/status.jade
index 77e1755..fc51be1 100644
--- a/BuildServer/views/status.jade
+++ b/BuildServer/views/status.jade
@@ -21,8 +21,9 @@ block content
 		h2 Artifacts
 		ul
 			each file in files
-				li
-					a(href="/artifact/" + [owner, reponame, branchName, rev, file].join("/")) #{file}
+				if file[file.length-1] != "/"
+					li
+						a(href="/artifact/" + [owner, reponame, branchName, rev, file].join("/")) #{file}
 	if (report && report.result && report.result.messages && report.result.messages.$allMessages)
 		h2 Build output
 		pre