From d127964eff5b78b2374aed25ef15651dbdbff466 Mon Sep 17 00:00:00 2001 From: Pierre Rudloff Date: Wed, 1 Jul 2020 22:52:22 +0200 Subject: [PATCH] Simplify PSR-4 autoload --- .../Controller}/BaseController.php | 0 .../Controller}/DownloadController.php | 0 .../Controller}/FrontController.php | 0 .../Controller}/JsonController.php | 0 .../ConfigException.php | 0 .../ConvertedPlaylistArchiveStream.php | 0 .../PlaylistArchiveStream.php | 0 .../YoutubeChunkStream.php | 0 classes/{streams => Stream}/YoutubeStream.php | 0 composer.json | 5 +- i18n/template.pot | 159 +++++++++--------- phpunit.xml | 1 - 12 files changed, 81 insertions(+), 84 deletions(-) rename {controllers => classes/Controller}/BaseController.php (100%) rename {controllers => classes/Controller}/DownloadController.php (100%) rename {controllers => classes/Controller}/FrontController.php (100%) rename {controllers => classes/Controller}/JsonController.php (100%) rename classes/{exceptions => Exception}/ConfigException.php (100%) rename classes/{streams => Stream}/ConvertedPlaylistArchiveStream.php (100%) rename classes/{streams => Stream}/PlaylistArchiveStream.php (100%) rename classes/{streams => Stream}/YoutubeChunkStream.php (100%) rename classes/{streams => Stream}/YoutubeStream.php (100%) diff --git a/controllers/BaseController.php b/classes/Controller/BaseController.php similarity index 100% rename from controllers/BaseController.php rename to classes/Controller/BaseController.php diff --git a/controllers/DownloadController.php b/classes/Controller/DownloadController.php similarity index 100% rename from controllers/DownloadController.php rename to classes/Controller/DownloadController.php diff --git a/controllers/FrontController.php b/classes/Controller/FrontController.php similarity index 100% rename from controllers/FrontController.php rename to classes/Controller/FrontController.php diff --git a/controllers/JsonController.php b/classes/Controller/JsonController.php similarity index 100% rename from controllers/JsonController.php rename to classes/Controller/JsonController.php diff --git a/classes/exceptions/ConfigException.php b/classes/Exception/ConfigException.php similarity index 100% rename from classes/exceptions/ConfigException.php rename to classes/Exception/ConfigException.php diff --git a/classes/streams/ConvertedPlaylistArchiveStream.php b/classes/Stream/ConvertedPlaylistArchiveStream.php similarity index 100% rename from classes/streams/ConvertedPlaylistArchiveStream.php rename to classes/Stream/ConvertedPlaylistArchiveStream.php diff --git a/classes/streams/PlaylistArchiveStream.php b/classes/Stream/PlaylistArchiveStream.php similarity index 100% rename from classes/streams/PlaylistArchiveStream.php rename to classes/Stream/PlaylistArchiveStream.php diff --git a/classes/streams/YoutubeChunkStream.php b/classes/Stream/YoutubeChunkStream.php similarity index 100% rename from classes/streams/YoutubeChunkStream.php rename to classes/Stream/YoutubeChunkStream.php diff --git a/classes/streams/YoutubeStream.php b/classes/Stream/YoutubeStream.php similarity index 100% rename from classes/streams/YoutubeStream.php rename to classes/Stream/YoutubeStream.php diff --git a/composer.json b/composer.json index df69396..617dd1e 100644 --- a/composer.json +++ b/composer.json @@ -67,9 +67,6 @@ "autoload": { "psr-4": { "Alltube\\": "classes/", - "Alltube\\Stream\\": "classes/streams/", - "Alltube\\Exception\\": "classes/exceptions/", - "Alltube\\Controller\\": "controllers/", "Alltube\\Test\\": "tests/" } }, @@ -79,7 +76,7 @@ "release": "robo release --ansi", "update-locales": [ "tsmarty2c.php templates > i18n/template.pot", - "xgettext --omit-header -kt -j -o i18n/template.pot classes/*.php classes/*/*.php controllers/*" + "xgettext --omit-header -kt -j -o i18n/template.pot classes/*.php classes/*/*.php" ], "youtube-dl": "vendor/ytdl-org/youtube-dl/youtube_dl/__main__.py" }, diff --git a/i18n/template.pot b/i18n/template.pot index ce9d383..48bfa8c 100644 --- a/i18n/template.pot +++ b/i18n/template.pot @@ -1,6 +1,27 @@ msgid "" msgstr "Content-Type: text/plain; charset=UTF-8\n" +#: templates/playlist.tpl:12 +msgid "Videos extracted from @title:" +msgstr "" + +#: templates/playlist.tpl:38 templates/password.tpl:11 templates/index.tpl:19 +#: templates/info.tpl:101 +msgid "Download" +msgstr "" + +#: templates/playlist.tpl:39 +msgid "More options" +msgstr "" + +#: templates/inc/header.tpl:4 +msgid "Switch language" +msgstr "" + +#: templates/inc/header.tpl:8 +msgid "Set language" +msgstr "" + #: templates/inc/footer.tpl:8 msgid "Code by @dev" msgstr "" @@ -25,12 +46,44 @@ msgstr "" msgid "Donate" msgstr "" -#: templates/inc/header.tpl:4 -msgid "Switch language" +#: templates/password.tpl:5 +msgid "This video is protected" msgstr "" -#: templates/inc/header.tpl:8 -msgid "Set language" +#: templates/password.tpl:6 +msgid "You need a password in order to download this video." +msgstr "" + +#: templates/password.tpl:8 +msgid "Video password" +msgstr "" + +#: templates/index.tpl:8 +msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)" +msgstr "" + +#: templates/index.tpl:25 +msgid "Audio only (MP3)" +msgstr "" + +#: templates/index.tpl:28 +msgid "From" +msgstr "" + +#: templates/index.tpl:31 +msgid "to" +msgstr "" + +#: templates/index.tpl:39 +msgid "See all supported websites" +msgstr "" + +#: templates/index.tpl:41 +msgid "Drag this to your bookmarks bar:" +msgstr "" + +#: templates/index.tpl:43 +msgid "Bookmarklet" msgstr "" #: templates/info.tpl:11 @@ -81,23 +134,6 @@ msgstr "" msgid "kbit/s audio" msgstr "" -#: templates/info.tpl:101 templates/playlist.tpl:38 templates/password.tpl:11 -#: templates/index.tpl:19 -msgid "Download" -msgstr "" - -#: templates/playlist.tpl:12 -msgid "Videos extracted from @title:" -msgstr "" - -#: templates/playlist.tpl:39 -msgid "More options" -msgstr "" - -#: templates/extractors.tpl:4 controllers/FrontController.php:109 -msgid "Supported websites" -msgstr "" - #: templates/error.tpl:5 msgid "An error occurred" msgstr "" @@ -106,106 +142,71 @@ msgstr "" msgid "Please check the URL of your video." msgstr "" -#: templates/password.tpl:5 -msgid "This video is protected" -msgstr "" - -#: templates/password.tpl:6 -msgid "You need a password in order to download this video." -msgstr "" - -#: templates/password.tpl:8 -msgid "Video password" -msgstr "" - -#: templates/index.tpl:8 -msgid "Copy here the URL of your video (Youtube, Dailymotion, etc.)" -msgstr "" - -#: templates/index.tpl:25 -msgid "Audio only (MP3)" -msgstr "" - -#: templates/index.tpl:28 -msgid "From" -msgstr "" - -#: templates/index.tpl:31 -msgid "to" -msgstr "" - -#: templates/index.tpl:39 -msgid "See all supported websites" -msgstr "" - -#: templates/index.tpl:41 -msgid "Drag this to your bookmarks bar:" -msgstr "" - -#: templates/index.tpl:43 -msgid "Bookmarklet" -msgstr "" - -#: classes/Config.php:156 -msgid "Best" -msgstr "" - -#: classes/Config.php:157 -msgid "Remux best video with best audio" +#: templates/extractors.tpl:4 classes/Controller/FrontController.php:109 +msgid "Supported websites" msgstr "" #: classes/Config.php:158 +msgid "Best" +msgstr "" + +#: classes/Config.php:159 +msgid "Remux best video with best audio" +msgstr "" + +#: classes/Config.php:160 msgid "Worst" msgstr "" -#: controllers/DownloadController.php:63 controllers/FrontController.php:164 +#: classes/Controller/DownloadController.php:63 +#: classes/Controller/FrontController.php:164 msgid "Wrong password" msgstr "" -#: controllers/DownloadController.php:68 +#: classes/Controller/DownloadController.php:68 msgid "Conversion of playlists is not supported." msgstr "" -#: controllers/DownloadController.php:75 +#: classes/Controller/DownloadController.php:75 msgid "Conversion of M3U8 files is not supported." msgstr "" -#: controllers/DownloadController.php:81 +#: classes/Controller/DownloadController.php:81 msgid "Conversion of DASH segments is not supported." msgstr "" -#: controllers/FrontController.php:63 +#: classes/Controller/FrontController.php:63 msgid "" "Easily download videos from Youtube, Dailymotion, Vimeo and other websites." msgstr "" -#: controllers/FrontController.php:110 +#: classes/Controller/FrontController.php:110 msgid "" "List of all supported websites from which Alltube Download can extract video " "or audio files" msgstr "" -#: controllers/FrontController.php:136 +#: classes/Controller/FrontController.php:136 msgid "Password prompt" msgstr "" -#: controllers/FrontController.php:138 +#: classes/Controller/FrontController.php:138 msgid "" "You need a password in order to download this video with Alltube Download" msgstr "" -#: controllers/FrontController.php:172 +#: classes/Controller/FrontController.php:172 msgid "Video download" msgstr "" -#: controllers/FrontController.php:174 +#: classes/Controller/FrontController.php:174 msgid "Download video from @extractor" msgstr "" -#: controllers/FrontController.php:180 +#: classes/Controller/FrontController.php:180 msgid "Download @title from @extractor" msgstr "" -#: controllers/FrontController.php:253 +#: classes/Controller/FrontController.php:253 msgid "Error" msgstr "" diff --git a/phpunit.xml b/phpunit.xml index dfdb3ad..9080073 100644 --- a/phpunit.xml +++ b/phpunit.xml @@ -3,7 +3,6 @@ classes/ - controllers/