fixup! fix: keep track of download count

Signed-off-by: Hamza <[email protected]>

Author: hamza221

lib/Listener/BeforeNodeReadListener.php

@@ -19,6 +19,10 @@
 use OCP\Files\Folder;
 use OCP\Files\NotFoundException;
 use OCP\Files\Storage\ISharedStorage;
+use OCP\ICache;
+use OCP\ICacheFactory;
+use OCP\IRequest;
+use OCP\ISession;
 use OCP\Share\IManager;
 use OCP\Share\IShare;
 use Psr\Log\LoggerInterface;
@@ -27,11 +31,16 @@
  * @template-implements IEventListener<BeforeNodeReadEvent|BeforeZipCreatedEvent|Event>
  */
 class BeforeNodeReadListener implements IEventListener {
+	private ICache $cache;
 	public function __construct(
 		private IManager $manager,
 		private LimitMapper $mapper,
 		private LoggerInterface $logger,
+		private IRequest $request,
+		private ISession $session,
+		ICacheFactory $cacheFactory,
 	) {
+		$this->cache = $cacheFactory->createDistributed('files_downloadlimit_event');
 	}
 
 	public function handle(Event $event): void {
@@ -67,10 +76,13 @@ public function handleBeforeZipCreatedEvent(BeforeZipCreatedEvent $event): void
 		/** @var ISharedStorage $storage */
 		$share = $storage->getShare();
 
-		if ($share->getShareType() !== IShare::TYPE_LINK) {
+		if (!in_array($share->getShareType(), [IShare::TYPE_EMAIL, IShare::TYPE_LINK])) {
 			return;
 		}
 
+		/* Cache that that folder download activity was published */
+		$this->cache->set($this->request->getId(), $node->getPath(), 3600);
+
 		$this->singleFileDownloaded($share);
 	}
 
@@ -93,10 +105,25 @@ public function handleBeforeNodeReadEvent(BeforeNodeReadEvent $event): void {
 		/** @var ISharedStorage $storage */
 		$share = $storage->getShare();
 
-		if ($share->getShareType() !== IShare::TYPE_LINK) {
+		if (!in_array($share->getShareType(), [IShare::TYPE_EMAIL, IShare::TYPE_LINK])) {
+			return;
+		}
+
+		$path = $this->cache->get($this->request->getId());
+		if (is_string($path) && str_starts_with($node->getPath(), $path)) {
+			/* An activity was published for a containing folder already */
 			return;
 		}
 
+		/* Avoid publishing several activities for one video playing */
+		$cacheKey = $node->getId() . $node->getPath() . $this->session->getId();
+		if (($this->request->getHeader('range') !== '') && ($this->cache->get($cacheKey) === 'true')) {
+			/* This is a range request and an activity for the same file was published in the same session */
+			return;
+		}
+		$this->cache->set($cacheKey, 'true', 3600);
+
+
 		$this->singleFileDownloaded($share);
 	}