Skip to content

Commit

Permalink
Handle web calls if when services aren't initialised
Browse files Browse the repository at this point in the history
  • Loading branch information
JackDallas committed May 24, 2022
1 parent f8d253c commit a42388a
Showing 1 changed file with 19 additions and 12 deletions.
31 changes: 19 additions & 12 deletions internal/web_service/web_service.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,15 +124,19 @@ type DownloadsResponse struct {
func (s *server) DownloadsHandler(w http.ResponseWriter, r *http.Request) {
var resp DownloadsResponse

for _, v := range s.transferManager.GetDownloads() {
resp.Downloads = append(resp.Downloads, Download{
Added: v.Added.Unix(),
Name: v.Name,
Progress: v.ProgressDownloader.GetProgress(),
Speed: v.ProgressDownloader.GetSpeed(),
})
if s.transferManager == nil {
resp.Status = "Not Initialized"
} else {
for _, v := range s.transferManager.GetDownloads() {
resp.Downloads = append(resp.Downloads, Download{
Added: v.Added.Unix(),
Name: v.Name,
Progress: v.ProgressDownloader.GetProgress(),
Speed: v.ProgressDownloader.GetSpeed(),
})
}
resp.Status = ""
}
resp.Status = ""

data, err := json.Marshal(resp)
if err != nil {
Expand All @@ -145,17 +149,20 @@ func (s *server) DownloadsHandler(w http.ResponseWriter, r *http.Request) {

func (s *server) BlackholeHandler(w http.ResponseWriter, r *http.Request) {
var resp BlackholeResponse
queue := s.directoryWatcherService.Queue.GetQueue()
if len(queue) > 0 {
for i, n := range queue {

if s.directoryWatcherService == nil {
resp.Status = "Not Initialized"
} else {
for i, n := range s.directoryWatcherService.Queue.GetQueue() {
name := path.Base(n)
resp.BlackholeFiles = append(resp.BlackholeFiles, BlackholeFile{
ID: i,
Name: name,
})
}

resp.Status = s.directoryWatcherService.GetStatus()
}
resp.Status = s.directoryWatcherService.GetStatus()

data, err := json.Marshal(resp)
if err != nil {
Expand Down

0 comments on commit a42388a

Please sign in to comment.