pisto/ncdownloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

improved user experience for novice user(including support for standalone aria2c and ytdl binaries);support for snap installation;close #19

Browse Source
This commit is contained in:
huangjx
2022-02-21 15:50:42 +08:00
parent 20b3e25369
commit 8e5ebdd8e7
11 changed files with 88 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
templates/Navigation.php
View File

@@ -1,25 +1,38 @@
<?php
$aria2_running = $_['aria2_running'];
$youtube_installed = $_['youtube_installed'];
$aria2_installed = $_['aria2_installed'];
extract($_);
$permission_error = sprintf("aria2 is installed but not executable.Please execute command sudo chmod 755 %s", $aria2_bin);
if ($youtube_installed && !$youtube_executable) {
$ytb_error = sprintf("youtube-dl is installed but not executable.Please execute command sudo chmod 755 %s", $youtube_bin);
} else if (!$youtube_installed && !$youtube_executable) {
$ytb_error = "youtube-dl is not installed!";
}
?>
<div id="app-navigation">
<?php if ($ncd_hide_errors): ?>
<?php if (isset($ytb_error)): ?>
<div data-error-message="<?php print $l->t($ytb_error);?>"></div>
<?php endif;?>
<?php endif;?>
<div class="app-navigation-new" id="search-download" data-inputbox="form-input-wrapper">
<button type="button" class="icon-add">
<?php print($l->t('Download & Search'));?>
</button>
</div>
<div class="app-navigation-new" id="start-aria2">
<?php if ($aria2_installed): ?>
<?php if ($aria2_installed && $aria2_executable): ?>
<button type="button" class="icon-power"
data-aria2="<?php $aria2_running ? print $l->t('on') : print $l->t('off');?>">
<?php $aria2_running ? print $l->t('Stop Aria2') : print $l->t('Start Aria2');?>
</button>
</button>
<?php elseif ($aria2_installed && !$aria2_executable): ?>
<button type="button" class="icon-power notinstalled" data-error-message="<?php print $l->t($permission_error);?>">
<?php print $l->t("aria2c is installed but not executable");?>
</button>
<?php else: ?>
<button type="button" class="icon-power notinstalled">
<?php print $l->t('Aria2 is not installed!');?>
<?php print $l->t("aria2c is not installed!");?>
</button>
<?php endif;?>
</div>

7
templates/settings/Settings.php
View File

@@ -1,5 +1,9 @@
<?php
extract($_);
$checked = '';
if ($ncd_hide_errors) {
$checked = "checked";
}
?>
<div id="app-settings">
<div id="app-settings-header">
@@ -11,6 +15,9 @@ extract($_);
</div>
<div id="app-settings-content">
<ul id="ncdownloader-settings-collapsible-container">
<li class="ncdownloader-settings-item" data-tippy-content="check this to show or suppress errors">
<input class="checkbox" type="checkbox" value="<?php print($ncd_hide_errors);?>" <?php print($checked);?> id="ncd-hide-errors"><label for="ncd-hide-errors"><?php p($l->t('Hide Errors'));?></label>
</li>
<li class="ncdownloader-settings-item">
<a href="<?php p($l->t($settings_url));?>" title="<?php p($l->t('Personal Settings'));?>" >
<?php p($l->t('Personal Settings'));?>