From e2d284399ab23eb6f19386a7245f869692ba00eb Mon Sep 17 00:00:00 2001
From: daCaPo <no-em@il.org>
Date: Thu, 27 Feb 2020 14:07:30 +0100
Subject: [PATCH] Switch from rg3/youtube-dl to ytdl-org/youtube-dl

---
 classes/Config.php        |  2 +-
 composer.json             | 12 ++++++------
 composer.lock             | 22 +++++++++++-----------
 config/config.example.yml |  2 +-
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/classes/Config.php b/classes/Config.php
index 367c0cb..270d394 100644
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -27,7 +27,7 @@ class Config
      *
      * @var string
      */
-    public $youtubedl = 'vendor/rg3/youtube-dl/youtube_dl/__main__.py';
+    public $youtubedl = 'vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py';
 
     /**
      * python binary path.
diff --git a/composer.json b/composer.json
index fe1bd53..64d3ec8 100644
--- a/composer.json
+++ b/composer.json
@@ -27,12 +27,12 @@
     "phpro/grumphp": "^0.17.0",
     "phpstan/phpstan": "~0.9.2",
     "phpunit/phpunit": "^8.4",
-    "rg3/youtube-dl": "^2020.01",
     "roave/security-advisories": "dev-master",
     "smarty-gettext/smarty-gettext": "^1.6",
     "squizlabs/php_codesniffer": "^3.5",
     "symfony/debug": "^4.0",
-    "symfony/var-dumper": "^4.0"
+    "symfony/var-dumper": "^4.0",
+    "ytdl-org/youtube-dl": "^2020.02"
   },
   "extra": {
     "paas": {
@@ -49,11 +49,11 @@
     {
       "type": "package",
       "package": {
-        "name": "rg3/youtube-dl",
-        "version": "2020.01.24",
+        "name": "ytdl-org/youtube-dl",
+        "version": "2020.02.16",
         "dist": {
           "type": "zip",
-          "url": "https://github.com/rg3/youtube-dl/archive/2020.01.24.zip"
+          "url": "https://github.com/ytdl-org/youtube-dl/archive/2020.02.16.zip"
         }
       }
     },
@@ -104,7 +104,7 @@
       "tsmarty2c.php templates > i18n/template.pot",
       "xgettext --omit-header -kt -j -o i18n/template.pot classes/*.php classes/*/*.php controllers/*"
     ],
-    "youtube-dl": "vendor/rg3/youtube-dl/youtube_dl/__main__.py"
+    "youtube-dl": "vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py"
   },
   "config": {
     "sort-packages": true,
diff --git a/composer.lock b/composer.lock
index 68da680..680a092 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "5d5031247a278c06162e69efb70e4b92",
+    "content-hash": "bcc40aec18060593e21a8157b07c4f55",
     "packages": [
         {
             "name": "aura/session",
@@ -486,7 +486,7 @@
             "version": "1.4.2",
             "source": {
                 "type": "git",
-                "url": "https://github.com/FontFaceKit/open-sans.git",
+                "url": "git@github.com:FontFaceKit/open-sans.git",
                 "reference": "2285c0300e6a4c8b102b98fb030fb38c26aa081c"
             },
             "dist": {
@@ -4142,15 +4142,6 @@
             ],
             "time": "2018-11-20T15:27:04+00:00"
         },
-        {
-            "name": "rg3/youtube-dl",
-            "version": "2020.01.24",
-            "dist": {
-                "type": "zip",
-                "url": "https://github.com/rg3/youtube-dl/archive/2020.01.24.zip"
-            },
-            "type": "library"
-        },
         {
             "name": "roave/security-advisories",
             "version": "dev-master",
@@ -6023,6 +6014,15 @@
                 "validate"
             ],
             "time": "2019-11-24T13:36:37+00:00"
+        },
+        {
+            "name": "ytdl-org/youtube-dl",
+            "version": "2020.02.16",
+            "dist": {
+                "type": "zip",
+                "url": "https://github.com/ytdl-org/youtube-dl/archive/2020.02.16.zip"
+            },
+            "type": "library"
         }
     ],
     "aliases": [],
diff --git a/config/config.example.yml b/config/config.example.yml
index fdf5595..7bf520c 100644
--- a/config/config.example.yml
+++ b/config/config.example.yml
@@ -1,6 +1,6 @@
 ---
 # Path to your youtube-dl binary
-youtubedl: vendor/rg3/youtube-dl/youtube_dl/__main__.py
+youtubedl: vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py
 
 # Path to your python binary
 python: /usr/bin/python