Flummi/Unraid-SlackPack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code cleanup, refactoring and bug fixes:

Browse Source 
- Fixed first time running warnings about missing packages.json / desc files
- Fixed bug preventing Select All from being able to be clicked
- Fixed bug in select all and dependent checkboxes / race condition
- Eliminated vertical space gap between page header and table
This commit is contained in:
Eric Schultz
2016-01-24 11:25:23 -06:00
parent 534c5775b8
commit 7576dc3f31
7 changed files with 254 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
source/NerdPack/usr/local/emhttp/plugins/NerdPack/include/DownloadHelpers.php
View File

@ -1,38 +1,36 @@
<?php
// Progress bar for curl download
function progress_bar($download_size, $downloaded_size, $upload_size = null, $uploaded_size = null)
{
function progress_bar($download_size, $downloaded_size, $upload_size = null, $uploaded_size = null) {
ob_start();
static $previousProgress = 0;
if ($download_size == 0)
$progress = 0;
else
$progress = round($downloaded_size * 100 / $download_size);
if ( $progress > $previousProgress){
$previousProgress = $progress;
$pct=(double)($progress/100);
$bar=round($pct * 30);
$pct_disp=number_format($pct * 100, 0);
$status_bar="\r[";
$status_bar.=str_repeat("|", $bar);
if($bar < 30){
$status_bar.=">";
$status_bar.=str_repeat("-", 30 - $bar);
if ($progress > $previousProgress) {
$previousProgress = $progress;
$pct = (double)($progress / 100);
$bar = round($pct * 30);
$pct_disp = number_format($pct * 100, 0);
$status_bar = "\r[";
$status_bar .= str_repeat("|", $bar);
if ($bar < 30) {
$status_bar .= ">";
$status_bar .= str_repeat("-", 30 - $bar);
} else {
$status_bar.="|";
$status_bar .= "|";
}
$status_bar.="] $pct_disp%";
$status_bar .= "] $pct_disp%";
echo $status_bar;
ob_flush();
if($progress == 100) {
if ($progress == 100) {
echo "\n";
}
}
@ -48,42 +46,39 @@ function get_file_from_url($file, $url) {
//curl_setopt($ch, CURLOPT_TIMEOUT, 3600);
curl_setopt($ch, CURLOPT_NOPROGRESS, false);
curl_setopt($ch, CURLOPT_HEADER, 0);
curl_setopt($ch, CURLOPT_USERAGENT, 'curl/' . $ch_vers['version'] );
curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, 'progress_bar' );
curl_setopt($ch, CURLOPT_USERAGENT, 'curl/'.$ch_vers['version']);
curl_setopt($ch, CURLOPT_PROGRESSFUNCTION, 'progress_bar');
curl_setopt($ch, CURLOPT_URL, $url);
curl_setopt($ch, CURLOPT_FILE, $chfile );
curl_setopt($ch, CURLOPT_FILE, $chfile);
curl_exec($ch);
curl_close($ch);
fclose($chfile);
}
// get a json array of the contents of gihub repo
function get_content_from_github($repo, $file){
function get_content_from_github($repo, $file) {
$ch = curl_init();
$ch_vers = curl_version();
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 30);
curl_setopt($ch, CURLOPT_HTTPHEADER, array('Accept: application/json', 'Content-Type: application/json'));
curl_setopt($ch, CURLOPT_USERAGENT, 'curl/' . $ch_vers['version'] );
curl_setopt($ch, CURLOPT_URL, $repo);
$content = curl_exec($ch);
curl_close($ch);
if ((!empty($content)) && ($content != file_get_contents($file)))
file_put_contents($file, $content);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_TIMEOUT, 30);
curl_setopt($ch, CURLOPT_HTTPHEADER, ['Accept: application/json', 'Content-Type: application/json']);
curl_setopt($ch, CURLOPT_USERAGENT, 'curl/'.$ch_vers['version']);
curl_setopt($ch, CURLOPT_URL, $repo);
$content = curl_exec($ch);
curl_close($ch);
if (!empty($content) && (!is_file($file) || $content != file_get_contents($file)))
file_put_contents($file, $content);
}
// Compare the github sha1 value of a file
function file_check_sha1($file, $sha1){
function file_check_sha1($file, $sha1) {
$size = filesize($file);
$handle = fopen($file, "rb");
$contents = fread($handle, $size);
fclose($handle);
$contents = file_get_contents($file);
// create a sha1 like github does
$str = "blob ".$size."\0".$contents;
$sha1_file = sha1($str);
$return = ($sha1_file == $sha1) ? true : false;
return $return;
return ($sha1_file == $sha1);
}
?>