Merge pull request #209 from pyromaniackeca/master

Replace pytube with pytubefix

.github/workflows/py.yml

@@ -70,7 +70,7 @@ jobs:
           pip install pygubu
           pip install rarfile
           pip install tkinterDnD2
-          pip install git+https://github.com/nficano/pytube
+          pip install pytubefix
           pip install opencv-contrib-python
           pip install scikit-learn
           pip install scipy

README

@@ -606,7 +606,7 @@ git clone https://github.com/sahlberg/pop-fe.git
 git clone https://github.com/NRGDEAD/Cue2cu2.git
 git clone https://github.com/putnam/binmerge.git
 git clone https://github.com/dcherednik/atracdenc.git
-pip3 install git+https://github.com/nficano/pytube
+pip3 install pytubefix
 pip3 install PyPDF2
 pip3 install requests
 pip3 install pycdlib  (or pip3 install pycdio)
@@ -729,4 +729,4 @@ docker run -it --entrypoint /bin/bash pop-fe:latest
 #     └── PSP/
 #         └── GAME/
 docker run -it --volume "$(pwd):/psp" pop-fe:latest --psp-dir=/psp/pspemu /psp/game.cue
- 
+

pop-fe-ps3.py

@@ -19,7 +19,7 @@
 
 have_pytube = False
 try:
-    import pytube
+    import pytubefix as pytube
     have_pytube = True
 except:
     True

pop-fe-psp.py

@@ -15,7 +15,7 @@
 
 have_pytube = False
 try:
-    import pytube
+    import pytubefix as pytube
     have_pytube = True
 except:
     True

pop-fe.py

@@ -37,8 +37,8 @@
     True
 have_pytube = False
 try:
-    from pytube import YouTube
-    from pytube.contrib.search import Search
+    from pytubefix import YouTube
+    from pytubefix.contrib.search import Search
     have_pytube = True
 except:
     True
@@ -3603,11 +3603,11 @@ def install_deps():
         subprocess.call(['pip', 'install', 'Crypto'])
     # pytube
     try:
-        from pytube import YouTube
+        from pytubefix import YouTube
         print('Pytube is already installed')
     except:
         print('Installing python pytube')
-        subprocess.call(['pip', 'install', 'git+https://github.com/nficano/pytube'])
+        subprocess.call(['pip', 'install', 'pytubefix'])
     # opencv-contrib-python
     try:
         import cv2