github
/
KodExplorer
mirror of https://github.com/kalcaddle/KodExplorer
1
0
Fork 0
Code Issues Releases Wiki Activity

Match rar when --> instead of % 

On my system

app/kod/archiveLib/bin/rar v /path/to/file.rar

Outputs:

UNRAR 5.40 freeware      Copyright (c) 1993-2016 Alexander Roshal

Archive: /path/to/file.rar
Details: RAR 4, volume

 Attributes      Size    Packed Ratio    Date    Time   Checksum  Name
----------- ---------  -------- ----- ---------- -----  --------  ----
 -rw-rw-r-- 12344567  11344567  -->  2019-03-25 02:02  1AA24184  file
----------- ---------  -------- ----- ---------- -----  --------  ----
            12344567  11344567   9%  volume 1                    1

This is when the archive is a multi-part archive. Therefore we need to adjust the regex slightly to include this case.
pull/352/head
Grant Millar 2019-05-01 19:06:00 +01:00 committed by GitHub
parent db3c392650
commit 0bc090069a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/kod/archiveLib/kodRarArchive.class.php
View File

@ -158,7 +158,7 @@ class kodRarArchive {
//windows :...D... 93691 82633 88% 2016-12-09 02:20 396CC62C 000/a/32486963.png //windows :...D... 93691 82633 88% 2016-12-09 02:20 396CC62C 000/a/32486963.png
//linux: :-rwxr-xr-x 93691 82643 88% 2016-12-09 02:20 396CC62C 000/a/32486963.png //linux: :-rwxr-xr-x 93691 82643 88% 2016-12-09 02:20 396CC62C 000/a/32486963.png
$reg = '/\s*([-\.\w]+)\s+(\d+)\s+(\d+)\s+\d+%\s+(\d{2,4}-\d{2}-\d{2} \d{2}:\d{2})\s+\w+\s+(.*)\n/i'; $reg = '/\s*([-\.\w]+)\s+(\d+)\s+(\d+)\s+\d+%|-+>\s+(\d{2,4}-\d{2}-\d{2} \d{2}:\d{2})\s+\w+\s+(.*)\n/i';
preg_match_all($reg,$match[1]."\n",$matchItem); preg_match_all($reg,$match[1]."\n",$matchItem);
if( !is_array($matchItem) || if( !is_array($matchItem) ||
count($matchItem) != 6 || count($matchItem) != 6 ||