Added showing size of artifact, also use it as detection of its prese…

…nce.

job.go

@@ -148,3 +148,11 @@ func (b *Job) SaveParams() error {
 func (b *Job) LoadParams() {
 	b.params = loadParams(filepath.Join(b.dir, "params"))
 }
+
+func (b *Job) ArtifactSize() int64 {
+	stat, err := os.Stat(b.ArtifactPath())
+	if err != nil {
+		return -1
+	}
+	return stat.Size()
+}

readme.md

@@ -45,4 +45,4 @@ rm -rf .git/
 - [X] Custom name of application (0.3.0)
 - [ ] Periodical watcher (running custom script saving state of last check)
 - [ ] Pipelining (jobs started according the result status)
-- [ ] Size and existance of artifact
+- [X] Size and existance of artifact

rest.go

@@ -23,19 +23,46 @@ type DomainProject struct {
 }
 
 type DomainJob struct {
-	Name      string            `json:"name"`
-	Status    JobStatus         `json:"status"`
-	StartDate time.Time         `json:"startDate"`
-	EndDate   time.Time         `json:"endDate"`
-	Output    string            `json:"output,omitempty"`
-	Params    map[string]string `json:"params,omitempty"`
+	Name         string            `json:"name"`
+	Status       JobStatus         `json:"status"`
+	StartDate    time.Time         `json:"startDate"`
+	EndDate      time.Time         `json:"endDate"`
+	Output       string            `json:"output,omitempty"`
+	Params       map[string]string `json:"params,omitempty"`
+	ArtifactSize float64           `json:"artifactSize,omitempty"`
+	ArtifactUnit MemoryUnit        `json:"artifactUnit"`
 }
 
 type DomainStatus struct {
 	Message string `json:"message"`
 	Code    int    `json:"code"`
 }
 
+type MemoryUnit byte
+
+const (
+	UnitB MemoryUnit = iota
+	UnitK
+	UnitM
+	UnitG
+	UnitT
+)
+
+func (b MemoryUnit) String() string {
+	return []string{"", "Ki", "Mi", "Gi", "Ti", "Pi"}[int(b)]
+}
+
+func (b MemoryUnit) MarshalJSON() ([]byte, error) {
+	return []byte("\"" + b.String() + "\""), nil
+}
+
+func (b *MemoryUnit) UnmarshalJSON(data []byte) error {
+	var v string
+	json.Unmarshal(data, &v)
+	*b = map[string]MemoryUnit{"": UnitB, "Ki": UnitK, "Mi": UnitM, "Gi": UnitG, "Ti": UnitT}[v]
+	return nil
+}
+
 type RestService struct {
 	c *Context
 }
@@ -216,12 +243,30 @@ func (s RestService) jobDetail(projectName, jobNumber string, w http.ResponseWri
 	}
 
 	status := b.Status()
+	artifactSize := float64(-1)
+	artifactUnit := UnitB
 	if s.c.IsBeingBuilt(b) {
 		status = InProgress
+	} else {
+		artifactSize, artifactUnit = tidyUnit(b.ArtifactSize(), 0)
 	}
 
 	output, _ := b.ReadOutput()
 
 	e := json.NewEncoder(w)
-	e.Encode(DomainJob{Name: b.name, Status: status, StartDate: b.StartDate(), EndDate: b.EndDate(), Output: output})
+	e.Encode(DomainJob{Name: b.name, Status: status, StartDate: b.StartDate(), EndDate: b.EndDate(), Output: output, ArtifactSize: artifactSize, ArtifactUnit: artifactUnit})
+}
+
+func tidyUnit(value int64, start byte) (float64, MemoryUnit) {
+	result := float64(value)
+	resultUnit := MemoryUnit(start)
+	for i := start; i < 5; i++ {
+		if val := result / 1024; val < 1 {
+			break
+		} else {
+			result = val
+			resultUnit = MemoryUnit(i + 1)
+		}
+	}
+	return result, resultUnit
 }

web.go

@@ -9,6 +9,7 @@ import (
 	"mime"
 	"net/http"
 	"os"
+	"strconv"
 	"strings"
 )
 
@@ -96,6 +97,7 @@ func (s *WebService) downloadArtifact(w http.ResponseWriter, r *http.Request) {
 
 		w.Header().Set("content-type", s.getMimeType(j.ArtifactPath()))
 		w.Header().Set("content-disposition", fmt.Sprintf("attachment; filename=\"%s_%s.tar.gz\"", p.name, j.name))
+		w.Header().Set("content-length", strconv.FormatInt(j.ArtifactSize(), 10))
 
 		w.WriteHeader(http.StatusOK)
 		io.Copy(w, f)

www/static/js/app.js

@@ -299,6 +299,17 @@ function initApp(name) {
 			else "";
 		};
 
+		context.artifactExists = () => {
+			return context.selectedJob != undefined && context.selectedJob.artifactSize != undefined && context.selectedJob.artifactSize > 0;
+		};
+
+		context.artifactSize = () => {
+			if (context.selectedJob != undefined && context.selectedJob.artifactSize != undefined && context.selectedJob.artifactSize > 0) {
+				return context.selectedJob.artifactSize.toFixed(2) + ' ' + context.selectedJob.artifactUnit + 'B';
+			}
+			return "";
+		}
+
 		context.downloadArtifact = (event) => {
 			if (event != undefined) {
 				event.preventDefault();

www/template.html

@@ -45,8 +45,10 @@ <h1>{{ .Name }}</h1>
 								<span class="label">Started:</span>
 								<span ajsf-text="startDateValue"></span>
 								<span ajsf-text="jobLength"></span>
-								<span class="label" ajsf-hide="selectedJob.status | eq 'inprogress'">Artifact:</span>
-								<a ajsf-href="artifactDownloadUrl()" ajsf-click="downloadArtifact" ajsf-hide="selectedJob.status | eq 'inprogress'">Download</a>
+								<a ajsf-href="artifactDownloadUrl()" ajsf-click="downloadArtifact" ajsf-show="artifactExists()">
+									<span class="label" >Artifact</span>
+									<span ajsf-text="'(' | suffix artifactSize | suffix ')'"></span>
+								</a>
 							</div>
 							<span class="resize" ajsf-click="maximize"></span>
 							<span class="indicator"></span>