genuineparts/alltube
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: Add path to "Can't find avconv" error

Browse source 
See #109
This commit is contained in:
Pierre Rudloff 2018-02-21 18:55:12 +01:00
parent a8cd915f01
commit 003452909a
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/VideoDownload.php
View file

@ -270,7 +270,7 @@ class VideoDownload
private function getAvconvProcess(stdClass $video, $audioBitrate, $filetype = 'mp3', $audioOnly = true) private function getAvconvProcess(stdClass $video, $audioBitrate, $filetype = 'mp3', $audioOnly = true)
{ {
if (!$this->checkCommand([$this->config->avconv, '-version'])) { if (!$this->checkCommand([$this->config->avconv, '-version'])) {
throw new Exception(_('Can\'t find avconv or ffmpeg.')); throw new Exception(_('Can\'t find avconv or ffmpeg at ').$this->config->avconv.'.');
} }
if ($video->protocol == 'rtmp') { if ($video->protocol == 'rtmp') {
@ -353,7 +353,7 @@ class VideoDownload
public function getM3uStream(stdClass $video) public function getM3uStream(stdClass $video)
{ {
if (!$this->checkCommand([$this->config->avconv, '-version'])) { if (!$this->checkCommand([$this->config->avconv, '-version'])) {
throw new Exception(_('Can\'t find avconv or ffmpeg.')); throw new Exception(_('Can\'t find avconv or ffmpeg at ').$this->config->avconv.'.');
} }
$process = new Process( $process = new Process(

40
i18n/template.pot
View file

@ -19,7 +19,7 @@ msgstr ""
#: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:97 #: templates/playlist.tpl:26 templates/password.tpl:10 templates/video.tpl:97
#: templates/video.tpl:100 templates/index.tpl:19 #: templates/video.tpl:100 templates/index.tpl:19
#: controllers/FrontController.php:265 #: controllers/FrontController.php:270
msgid "Download" msgid "Download"
msgstr "" msgstr ""
@ -39,7 +39,7 @@ msgstr ""
msgid "Video password" msgid "Video password"
msgstr "" msgstr ""
#: templates/extractors.tpl:4 controllers/FrontController.php:159 #: templates/extractors.tpl:4 controllers/FrontController.php:164
msgid "Supported websites" msgid "Supported websites"
msgstr "" msgstr ""
@ -139,68 +139,68 @@ msgstr ""
msgid "Bookmarklet" msgid "Bookmarklet"
msgstr "" msgstr ""
#: classes/VideoDownload.php:114 #: classes/VideoDownload.php:117
msgid "Wrong password" msgid "Wrong password"
msgstr "" msgstr ""
#: classes/VideoDownload.php:270 classes/VideoDownload.php:353 #: classes/VideoDownload.php:273 classes/VideoDownload.php:356
msgid "Can't find avconv or ffmpeg." msgid "Can't find avconv or ffmpeg at "
msgstr "" msgstr ""
#: classes/VideoDownload.php:326 classes/VideoDownload.php:485 #: classes/VideoDownload.php:329 classes/VideoDownload.php:488
msgid "Conversion of M3U8 files is not supported." msgid "Conversion of M3U8 files is not supported."
msgstr "" msgstr ""
#: classes/VideoDownload.php:334 classes/VideoDownload.php:371 #: classes/VideoDownload.php:337 classes/VideoDownload.php:374
#: classes/VideoDownload.php:404 classes/VideoDownload.php:437 #: classes/VideoDownload.php:407 classes/VideoDownload.php:440
#: classes/VideoDownload.php:493 #: classes/VideoDownload.php:496
msgid "Could not open popen stream." msgid "Could not open popen stream."
msgstr "" msgstr ""
#: classes/VideoDownload.php:461 #: classes/VideoDownload.php:464
msgid "Could not open fopen stream." msgid "Could not open fopen stream."
msgstr "" msgstr ""
#: controllers/FrontController.php:116 #: controllers/FrontController.php:121
msgid "" msgid ""
"Easily download videos from Youtube, Dailymotion, Vimeo and other websites." "Easily download videos from Youtube, Dailymotion, Vimeo and other websites."
msgstr "" msgstr ""
#: controllers/FrontController.php:160 #: controllers/FrontController.php:165
msgid "" msgid ""
"List of all supported websites from which Alltube Download can extract video " "List of all supported websites from which Alltube Download can extract video "
"or audio files" "or audio files"
msgstr "" msgstr ""
#: controllers/FrontController.php:185 #: controllers/FrontController.php:190
msgid "Password prompt" msgid "Password prompt"
msgstr "" msgstr ""
#: controllers/FrontController.php:186 #: controllers/FrontController.php:191
msgid "" msgid ""
"You need a password in order to download this video with Alltube Download" "You need a password in order to download this video with Alltube Download"
msgstr "" msgstr ""
#: controllers/FrontController.php:261 #: controllers/FrontController.php:266
msgid "Video download" msgid "Video download"
msgstr "" msgstr ""
#: controllers/FrontController.php:262 #: controllers/FrontController.php:267
msgid "Download video from " msgid "Download video from "
msgstr "" msgstr ""
#: controllers/FrontController.php:265 #: controllers/FrontController.php:270
msgid "from" msgid "from"
msgstr "" msgstr ""
#: controllers/FrontController.php:328 #: controllers/FrontController.php:333
msgid "Error" msgid "Error"
msgstr "" msgstr ""
#: controllers/FrontController.php:400 #: controllers/FrontController.php:405
msgid "You need to enable remux mode to merge two formats." msgid "You need to enable remux mode to merge two formats."
msgstr "" msgstr ""
#: controllers/FrontController.php:467 #: controllers/FrontController.php:472
msgid "Can't find URL of video." msgid "Can't find URL of video."
msgstr "" msgstr ""