Ensure download is counted for non video files

Signed-off-by: Carl Schwan <[email protected]>
nextcloud · Aug 1, 2024 · 4f84b32 · 4f84b32
1 parent 9dcf900
commit 4f84b32
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php
@@ -373,11 +373,14 @@ public function downloadShare($token, $files = null, $path = '', $downloadStartS
 		$userFolder = $this->rootFolder->getUserFolder($share->getShareOwner());
 		$originalSharePath = $userFolder->getRelativePath($share->getNode()->getPath());
 
+		$isVideo = false;
 
 		// Single file share
 		if ($share->getNode() instanceof \OCP\Files\File) {
+			$node = $share->getNode();
 			// Single file download
-			$this->singleFileDownloaded($share, $share->getNode());
+			$this->singleFileDownloaded($share, $node);
+			$isVideo = str_starts_with($node->getMimeType(), 'video/');
 		}
 		// Directory share
 		else {
@@ -398,8 +401,10 @@ public function downloadShare($token, $files = null, $path = '', $downloadStartS
 			$originalSharePath = $userFolder->getRelativePath($node->getPath());
 
 			if ($node instanceof \OCP\Files\File) {
+				$node = $share->getNode();
 				// Single file download
-				$this->singleFileDownloaded($share, $share->getNode());
+				$this->singleFileDownloaded($share, $node);
+				$isVideo = str_starts_with($node->getMimeType(), 'video/');
 			} else {
 				try {
 					if (!empty($files_list)) {
@@ -431,7 +436,9 @@ public function downloadShare($token, $files = null, $path = '', $downloadStartS
 		}
 
 		$this->emitAccessShareHook($share);
-		if (!isset($_SERVER['HTTP_RANGE'])) {
+
+		// Ensure download limit is counted unless we are streaming a video
+		if (!isset($_SERVER['HTTP_RANGE']) || !$isVideo) {
 			$this->emitShareAccessEvent($share, self::SHARE_DOWNLOAD);
 		}