Allow downloading Folddisco results

Author: milot-mirdita

backend/alignment.go

@@ -650,3 +650,27 @@ func ResultArchive(w io.Writer, id Id, base string) (err error) {
 	}
 	return nil
 }
+
+func ResultFolddiscoArchive(w io.Writer, id Id, base string, databases []string) (err error) {
+	gw := gzip.NewWriter(w)
+	defer func() {
+		cerr := gw.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+	tw := tar.NewWriter(gw)
+	defer func() {
+		cerr := tw.Close()
+		if err == nil {
+			err = cerr
+		}
+	}()
+
+	for _, name := range databases {
+		if err = addFile(tw, name+".m8"); err != nil {
+			return err
+		}
+	}
+	return nil
+}

backend/server.go

@@ -753,6 +753,39 @@ func server(jobsystem JobSystem, config ConfigRoot) {
 		io.Copy(w, bufio.NewReader(file))
 	}).Methods("GET")
 
+	r.HandleFunc("/result/folddisco/download/{ticket}", func(w http.ResponseWriter, req *http.Request) {
+		vars := mux.Vars(req)
+		ticket, err := jobsystem.GetTicket(Id(vars["ticket"]))
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		status, err := jobsystem.Status(ticket.Id)
+		if err != nil || status != StatusComplete {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+
+		name := "folddisco_results_" + string(ticket.Id) + ".tar.gz"
+		path := filepath.Join(filepath.Clean(config.Paths.Results), string(ticket.Id), name)
+		if _, err := os.Stat(path); os.IsNotExist(err) {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+		file, err := os.Open(path)
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusBadRequest)
+			return
+		}
+		defer file.Close()
+
+		w.Header().Set("Content-Disposition", "attachment; filename=\""+name+"\"")
+		w.Header().Set("Content-Type", "application/octet-stream")
+		w.Header().Set("Cache-Control", "public, max-age=3600")
+		io.Copy(w, bufio.NewReader(file))
+	}).Methods("GET")
+
 	r.HandleFunc("/result/foldmason/{ticket}", func(w http.ResponseWriter, req *http.Request) {
 		vars := mux.Vars(req)
 		ticket, err := jobsystem.GetTicket(Id(vars["ticket"]))

backend/worker.go

@@ -1604,6 +1604,21 @@ printf("%c%c%c%c",5,0,0,0) > db".dbtype"; printf("%c%c%c%c",0,0,0,0) > db"_seq.d
 			}
 		}
 
+		path := filepath.Join(filepath.Clean(config.Paths.Results), string(request.Id))
+		file, err := os.Create(filepath.Join(path, "folddisco_results_"+string(request.Id)+".tar.gz"))
+		if err != nil {
+			return &JobExecutionError{err}
+		}
+		err = ResultFolddiscoArchive(file, request.Id, path, job.Database)
+		if err != nil {
+			file.Close()
+			return &JobExecutionError{err}
+		}
+		err = file.Close()
+		if err != nil {
+			return &JobExecutionError{err}
+		}
+
 		if config.Verbose {
 			log.Print("Process finished gracefully without error")
 		}

frontend/Navigation.vue

@@ -113,7 +113,7 @@
             </v-list-item>
             </template>
         </v-list-group>
-        <!-- <v-list-group v-else-if="$route.name === 'folddiscoresult'" v-model="expanded">
+        <v-list-group v-else-if="$route.name === 'folddiscoresult'" v-model="expanded">
             <template slot="activator">
                 <v-list-item-action>
                     <v-icon>{{ $MDI.FileDownloadOutline }}</v-icon>
@@ -125,19 +125,19 @@
             <template v-if="!this.mini">
             <v-list-item
                 @click="$ELECTRON ? electronDownload($route.params.ticket) : null"
-                :href="$ELECTRON ? null : url('api/result/download/' + $route.params.ticket)"
+                :href="$ELECTRON ? null : url('api/result/folddisco/download/' + $route.params.ticket)"
                 :target="$ELECTRON ? null : '_blank'"
                 title="TODO"
             >
                 <v-list-item-action>
                     <v-icon>{{ $ELECTRON ? $MDI.FileDownloadOutline : $MDI.TableLarge }}</v-icon>
                 </v-list-item-action>
                 <v-list-item-content>
-                    <v-list-item-title>TODO</v-list-item-title>
-                    <v-list-item-subtitle>TODO</v-list-item-subtitle>
+                    <v-list-item-title>Hit tables</v-list-item-title>
+                    <v-list-item-subtitle>Archive of M8 files</v-list-item-subtitle>
                 </v-list-item-content>
             </v-list-item>
-            <v-list-item
+            <!-- <v-list-item
                 @click="downloadJSON"
                 style="padding-left: 16px;"
                 title="Download all result data (JSON file)"
@@ -149,9 +149,9 @@
                     <v-list-item-title>All data</v-list-item-title>
                     <v-list-item-subtitle>Reloadable JSON file</v-list-item-subtitle>
                 </v-list-item-content>
-            </v-list-item>
+            </v-list-item> -->
             </template>
-        </v-list-group> -->
+        </v-list-group>
 
         <v-divider></v-divider>