danog/MadelineProto
2
2
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply fixes from StyleCI

Browse Source
This commit is contained in:
Daniil Gentili 2017-01-12 10:05:13 +00:00 committed by StyleCI Bot
parent 3b8cc9d5ee
commit f27fa2717e
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/danog/MadelineProto/Tools.php
View File

@ -17,10 +17,15 @@ namespace danog\MadelineProto;
*/
trait Tools
{
public static function random($length) {
if ($length === 0) return '';
public static function random($length)
{
if ($length === 0) {
return '';
}
return \danog\MadelineProto\Tools::random($length);
}
/**
* posmod(numeric,numeric) : numeric
* Works just like the % (modulus) operator, only returns always a postive number.

17
src/danog/MadelineProto/Wrappers/FilesHandler.php
View File

@ -451,7 +451,9 @@ trait FilesHandler
public function get_download_info($message_media)
{
if (!isset($message_media['_']) && isset($message_media['InputFileLocation']) && isset($message_media['size'])) return $message_media;
if (!isset($message_media['_']) && isset($message_media['InputFileLocation']) && isset($message_media['size'])) {
return $message_media;
}
$res = [];
switch ($message_media['_']) {
case 'messageMediaPhoto':
@ -519,7 +521,6 @@ trait FilesHandler
$stream = fopen($file, 'w');
$info = $this->get_download_info($message_media);
$this->download_to_stream($info, $stream, $cb, filesize($file), $info['size']);
return $file;
@ -533,16 +534,20 @@ trait FilesHandler
};
}
$info = $this->get_download_info($message_media);
if ($end === -1) $end = $info['size'];
if (stream_get_meta_data($stream)['seekable']) fseek($stream, $offset);
if ($end === -1) {
$end = $info['size'];
}
if (stream_get_meta_data($stream)['seekable']) {
fseek($stream, $offset);
}
$size = $end - $offset;
$part_size = 512 * 1024;
$percent = 0;
while ($percent < 100) {
$real_part_size = ($offset + $part_size > $end) ? $part_size - (($offset + $part_size) - $end) : $part_size;
\danog\MadelineProto\Logger::log($real_part_size, $offset);
\danog\MadelineProto\Logger::log($real_part_size, $offset);
fwrite($stream, $this->API->method_call('upload.getFile', ['location' => $info['InputFileLocation'], 'offset' => $offset, 'limit' => $real_part_size], null, true)['bytes']);
\danog\MadelineProto\Logger::log($offset, $size, ftell($stream));
\danog\MadelineProto\Logger::log($offset, $size, ftell($stream));
$cb($percent = ($offset += $real_part_size) * 100 / $size);
}