This commit is contained in:
Daniil Gentili 2017-02-18 23:33:48 +01:00
parent 4a27238af4
commit ec5e23131e
2 changed files with 5 additions and 6 deletions

View File

@ -155,6 +155,7 @@ trait CallHandler
return $server_answer; return $server_answer;
} }
throw new \danog\MadelineProto\Exception('An error occurred while calling method '.$method.' ('.$last_error.').'); throw new \danog\MadelineProto\Exception('An error occurred while calling method '.$method.' ('.$last_error.').');
} }

View File

@ -299,7 +299,7 @@ trait Files
if (isset($info['InputFileLocation']['dc_id'])) { if (isset($info['InputFileLocation']['dc_id'])) {
$this->switch_dc($info['InputFileLocation']['dc_id']); $this->switch_dc($info['InputFileLocation']['dc_id']);
} }
$end = false; $theend = false;
while (true) { while (true) {
//$real_part_size = (($offset + $part_size > $end) && $end !== -1) ? $part_size - (($offset + $part_size) - $end) : $part_size; //$real_part_size = (($offset + $part_size > $end) && $end !== -1) ? $part_size - (($offset + $part_size) - $end) : $part_size;
try { try {
@ -322,18 +322,16 @@ trait Files
} }
if ($end !== -1 && strlen($res['bytes']) + $downloaded_size > $size) { if ($end !== -1 && strlen($res['bytes']) + $downloaded_size > $size) {
$res['bytes'] = substr($res['bytes'], 0, (strlen($res['bytes']) + $downloaded_size) - $size); $res['bytes'] = substr($res['bytes'], 0, (strlen($res['bytes']) + $downloaded_size) - $size);
$end = true; $theend = true;
} }
$offset += strlen($res['bytes']); $offset += strlen($res['bytes']);
$downloaded_size += strlen($res['bytes']); $downloaded_size += strlen($res['bytes']);
\danog\MadelineProto\Logger::log([fwrite($stream, $res['bytes'])], \danog\MadelineProto\Logger::ULTRA_VERBOSE); \danog\MadelineProto\Logger::log([fwrite($stream, $res['bytes'])], \danog\MadelineProto\Logger::ULTRA_VERBOSE);
if ($end) { if ($theend) {
break; break;
} }
//\danog\MadelineProto\Logger::log([$offset, $size, ftell($stream)], \danog\MadelineProto\Logger::ULTRA_VERBOSE); //\danog\MadelineProto\Logger::log([$offset, $size, ftell($stream)], \danog\MadelineProto\Logger::ULTRA_VERBOSE);
if ($end !== -1) { $cb($percent = $downloaded_size * 100 / $size);
$cb($percent = $downloaded_size * 100 / $size);
}
} }
if ($end === -1) { if ($end === -1) {
$cb(100); $cb(100);