import order

server/handlers.go

@@ -686,6 +686,9 @@ func (s *Server) unlock(token, filename string) {
 }
 
 func (s *Server) checkMetadata(ctx context.Context, token, filename string, increaseDownload bool) (metadata, error) {
+	s.lock(token, filename)
+	defer s.unlock(token, filename)
+
 	var metadata metadata
 
 	r, _, err := s.storage.Get(ctx, token, fmt.Sprintf("%s.metadata", filename))
@@ -702,23 +705,7 @@ func (s *Server) checkMetadata(ctx context.Context, token, filename string, incr
 	} else if !metadata.MaxDate.IsZero() && time.Now().After(metadata.MaxDate) {
 		return metadata, errors.New("maxDate expired")
 	} else if metadata.MaxDownloads != -1 && increaseDownload {
-		s.lock(token, filename)
-		defer s.unlock(token, filename)
-
-		r2, _, err := s.storage.Get(ctx, token, fmt.Sprintf("%s.metadata", filename))
-		defer CloseCheck(r2.Close)
-
-		if err != nil {
-			return metadata, err
-		}
-
-		if err := json.NewDecoder(r2).Decode(&metadata); err != nil {
-			return metadata, err
-		}
-
-		if metadata.Downloads >= metadata.MaxDownloads {
-			return metadata, errors.New("maxDownloads expired")
-		}
+		// todo(nl5887): mutex?
 
 		// update number of downloads
 		metadata.Downloads++
@@ -1007,7 +994,6 @@ func (s *Server) headHandler(w http.ResponseWriter, r *http.Request) {
 
 	remainingDownloads, remainingDays := metadata.remainingLimitHeaderValues()
 
-	w.Header().Set("Accept-Ranges", "bytes")
 	w.Header().Set("Content-Type", contentType)
 	w.Header().Set("Content-Length", strconv.FormatUint(contentLength, 10))
 	w.Header().Set("Connection", "close")
@@ -1065,7 +1051,7 @@ func (s *Server) getHandler(w http.ResponseWriter, r *http.Request) {
 		reader = ioutil.NopCloser(bluemonday.UGCPolicy().SanitizeReader(reader))
 	}
 
-	if r.Header.Get("Range") != "" {
+	if w.Header().Get("Range") != "" || strings.HasPrefix(metadata.ContentType, "video") || strings.HasPrefix(metadata.ContentType, "audio") {
 		file, err := ioutil.TempFile(s.tempPath, "range-")
 		defer s.cleanTmpFile(file)