From 8292c7ad680c3d7093e15c6133fddda55baf9cf5 Mon Sep 17 00:00:00 2001
From: Sarah <37188711+sagarrat7@users.noreply.github.com>
Date: Tue, 23 Aug 2022 21:19:52 -0700
Subject: [PATCH] feature/support-undownloadable-vimeo-links (#205)

* updated vimeo downloader

* linter

* removed unneeded files

* throw error when invalid uri detected
---
 cdp_backend/tests/conftest.py                 |   3 +++
 cdp_backend/tests/resources/example_video.mp4 | Bin 8378175 -> 8378175 bytes
 cdp_backend/tests/utils/test_file_utils.py    |  12 ++++++++++++
 cdp_backend/utils/file_utils.py               |  10 +++++++++-
 4 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/cdp_backend/tests/conftest.py b/cdp_backend/tests/conftest.py
index e1a96e8c..7e2e3100 100644
--- a/cdp_backend/tests/conftest.py
+++ b/cdp_backend/tests/conftest.py
@@ -40,6 +40,9 @@ def resources_dir() -> Path:
 # City of Versailles, Kentucky
 EXAMPLE_VIMEO = "https://vimeo.com/503166067"
 
+# City of Chicago, Illinois
+EXAMPLE_VIMEO_SHOWCASE = "https://vimeo.com/showcase/6277394/video/722690793"
+
 
 @pytest.fixture
 def example_video(resources_dir: Path) -> Path:
diff --git a/cdp_backend/tests/resources/example_video.mp4 b/cdp_backend/tests/resources/example_video.mp4
index 5dd374c1bc42491658519be6542ef747539874f2..884d1e6e31c23bd31dd11cbd7a96ca70d4c1ff11 100644
GIT binary patch
delta 798
zcmW;IT})DO7{~GHNqaHV5G~&VOA9mb@FtQb7L@^}MSxaVh(H<?X=awGbF!VS`4XG1
zRd>$DTwATHr>#xrWUafrvI}pzao%{7&CNUeJzRV)&i8rF+5dl*KJN)j@TM)tpzPC&
zW~0*I84MakF&<K<>AudaW~A#)<DpC`l$i$UAizGz0Pg$Y033uv6w1ts4dESWYb*;6
zLpB_N9LR;EAcH*G8k6_s@v?7L4*5_3$KW^=l5e)?_X01NEyYj*rEmfiWVR?PojeT0
zl~4vJ;S>ep<$E$71n0}40!~wK{>;KVj=2pgsD!hW+fX&!%5i$K3eM5=r25|v4l$Po
zszIcfOItV3ad}q@I?&VduA#A>qhK^b4VXwU)-G0aTnW^I8P3y6pl<RfN2j_TE<gi0
z)t1t49D6q`&<Gc)cjMCTCywE`6)wXS3dgS+Q=4<PCTY%g4Qw=LvkR%;oJiWGMA8Ax
za2;AGk!*dRx|LOaL$b<mf)j3$Rqp!Z;O|%XT;K)|v{8kxJx#*{)l@s&hC8I1x?7bx
zx7*{D+@21&2lvVC@x=;xdp+udPVm!uwCl?@#|eJ`f)Jt!|AU%e9Fy8^=z)h2rldAf
zUBrVOM+6?hW7=^<RUbGiHly%_6q~(GT^zdYeejgJ?fu(c4&FpRJR@&n;NuzxVdOap
zBZDO~{7@!)0WYacHk8fxC9z}Z^<qJObLT*p(X7#%G+I$qMtb~%x*CJDTKo!zVT4wT
QM-|`Gb*8s}*G60Z11wE6TmS$7

delta 795
zcmX}oT})DO7{~GH33@S;kX{r`EGdi-P6lb3SX2g-76F=JAtF&)q}eOJ%*A%L=1Xik
zd%1Hq=GtmqJ#B58leO;Z$}YI+#@U58+1$9Z-@`>0pR=9s^PIEuKlAT5gn4+;oL8yo
ztu$Fo8gnpUX>Yg0LxwEz<HQeHwpjHnB$q<+EXW1{Hh~PdZ-y<f6}C}Go)e4W8EJJm
z2ev~l?0`H_z)ny?KCKR`dh>bNKdFLUup9QkUML{{WZ}<QUZ}RJp$Lj$ACyqFRa5Tb
zVKA<NQrHg%C>Sr>Q1YO2rVO-jkUD1$&A#HOsMA3?941AbexQlt_^2L^(D<m~?^g~n
zcLf;1L@~EmGsAHqEy7W#q=odc`dW^H*$fsqPJ+2=&d6~w$g1H4Ee2~wzj1UKYT+c*
zk;`B${=~6o*$VY=ih7n$r{8hxire4}oTaY#Idf)n+TI{d+s}iYrtJ<P^P3Y%hm=S<
z;R0NQMoJ``UT02aQ(cm5s>|SlD`Zo-e>wU6TE81S;Du(=`dhLpc%U0=fveC;y0L5e
z%y)adKFQ;4gX?gEJYIjSfVWc-KeR)DQjv}iYaB-cLFj}KjRbC5zH>~9VYmgip^K7Y
zx3Q21>&|Yt19xfN8PUDrSh5m<dsMR0)6l^o?C6F26n6Bj`8fCzeei&MiHC2OI0%D}
zNEm!vG{HBe$|vxYN|n)EJ};TtqR;21UaI>QQ(u0!%Ku+vQcB$q129M_^^odwwrH99
IvozHB4;kk;D*ylh

diff --git a/cdp_backend/tests/utils/test_file_utils.py b/cdp_backend/tests/utils/test_file_utils.py
index 2f3c17a0..fe4f80ab 100644
--- a/cdp_backend/tests/utils/test_file_utils.py
+++ b/cdp_backend/tests/utils/test_file_utils.py
@@ -26,6 +26,7 @@
     EXAMPLE_VIDEO_FILENAME,
     EXAMPLE_VIDEO_HD_FILENAME,
     EXAMPLE_VIMEO,
+    EXAMPLE_VIMEO_SHOWCASE,
     EXAMPLE_YOUTUBE_VIDEO_EMBEDDED,
     EXAMPLE_YOUTUBE_VIDEO_PARAMETER,
     EXAMPLE_YOUTUBE_VIDEO_SHORT,
@@ -247,6 +248,7 @@ def test_convert_video_to_mp4(
         (EXAMPLE_YOUTUBE_VIDEO_PARAMETER, "XALBGkjkUPQ.mp4"),
         (EXAMPLE_YOUTUBE_VIDEO_SHORT, "XALBGkjkUPQ.mp4"),
         (EXAMPLE_VIMEO, Path("503166067") / "503166067.mp4"),
+        (EXAMPLE_VIMEO_SHOWCASE, Path("722690793") / "722690793.mp4"),
         (EXAMPLE_M3U8_PLAYLIST_URI, None),
     ],
 )
@@ -264,3 +266,13 @@ def test_remote_resource_copy(
     assert Path(actual_uri).is_file()
 
     os.remove(actual_uri)
+
+
+def test_invalid_uri() -> None:
+    with pytest.raises(Exception) as e:
+        file_utils.resource_copy("https://vimeo.com/fakeuri")
+    assert e.type == ValueError
+    assert (
+        str(e.value)
+        == "Could not extract video id from uri: 'https://vimeo.com/fakeuri'"
+    )
diff --git a/cdp_backend/utils/file_utils.py b/cdp_backend/utils/file_utils.py
index cf4d18eb..69a081e3 100644
--- a/cdp_backend/utils/file_utils.py
+++ b/cdp_backend/utils/file_utils.py
@@ -4,6 +4,7 @@
 import logging
 import math
 import random
+import re
 from hashlib import sha256
 from pathlib import Path
 from typing import Optional, Tuple, Union
@@ -226,7 +227,14 @@ def vimeo_copy(uri: str, dst: Path, overwrite: bool = False) -> str:
     if dst.is_file() and not overwrite:
         raise FileExistsError(dst)
 
-    v = Vimeo(uri)
+    # 9 is the length of the video id; no other
+    # string of numbers in the URL has length 9 (thankfully)
+    match = re.findall(r"\d{9}", uri)
+    if len(match) == 0:
+        raise ValueError(f"Could not extract video id from uri: '{uri}'")
+
+    vid = match[0]
+    v = Vimeo.from_video_id(video_id=vid)
 
     if len(v.streams) == 0:
         raise ValueError("File {} contains no downloadable streams", uri)