Fix uploading thumbnails to YouTube

Martin1982 · May 7, 2020 · 4f67ad1 · 4f67ad1
1 parent eeb265d
commit 4f67ad1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 12 deletions.
diff --git a/EventListener/ThumbnailUploadListener.php b/EventListener/ThumbnailUploadListener.php
@@ -66,11 +66,11 @@ public function postLoad(LifecycleEventArgs $args): void
             return;
         }
 
-        $thumbnail = $entity->getThumbnail();
+        $thumbnail = (string) $entity->getThumbnail();
 
         if (null !== $thumbnail) {
             $entity->setThumbnail(
-                new File($this->uploadService->getTargetDirectory().DIRECTORY_SEPARATOR.$thumbnail, false)
+                new File($thumbnail, false)
             );
         }
     }

diff --git a/Service/ChannelApi/Client/YouTubeClient.php b/Service/ChannelApi/Client/YouTubeClient.php
@@ -127,7 +127,7 @@ public function addThumbnailToBroadcast(\Google_Service_YouTube_LiveBroadcast $y
         }
 
         $chunkSizeBytes = (1 * 1024 * 1024);
-        $client = $this->googleClient->getClient();
+        $client = $this->youTubeClient->getClient();
 
         if (!$client) {
             return false;

diff --git a/Tests/EventListener/ThumbnailUploadListenerTest.php b/Tests/EventListener/ThumbnailUploadListenerTest.php
@@ -135,11 +135,7 @@ public function testPostLoad(): void
         $objectManager = $this->createMock(ObjectManager::class);
         $liveBroadcast = new LiveBroadcast();
 
-        $liveBroadcast->setThumbnail('thumbnail.jpg');
-
-        $this->uploadService->expects(static::once())
-            ->method('getTargetDirectory')
-            ->willReturn('/tmp/dir');
+        $liveBroadcast->setThumbnail('/tmp/dir/thumbnail.jpg');
 
         $args = new LifecycleEventArgs($liveBroadcast, $objectManager);
         $this->eventListener->postLoad($args);

diff --git a/Tests/Service/ChannelApi/Client/YouTubeClientTest.php b/Tests/Service/ChannelApi/Client/YouTubeClientTest.php
@@ -414,17 +414,16 @@ public function testAddThumbnailToBroadcast(): void
             ->method('execute')
             ->willReturn(new Response(200, ['location' => 'test']));
 
-        $this->google->expects(self::atLeastOnce())
-            ->method('getClient')
-            ->willReturn($googleClient);
-
         $thumbnails = $this->createMock(\Google_Service_YouTube_Resource_Thumbnails::class);
         $thumbnails->expects(self::atLeastOnce())
             ->method('set')
             ->with('youtube.id')
             ->willReturn(new Request('get', 'test_upload'));
 
         $client = $this->createMock(\Google_Service_YouTube::class);
+        $client->expects(self::atLeastOnce())
+            ->method('getClient')
+            ->willReturn($googleClient);
         $client->thumbnails = $thumbnails;
 
         $youtube = new YouTubeClient($this->config, $this->google);