Compare commits

...

2 Commits

2 changed files with 22 additions and 15 deletions

View File

@ -54,13 +54,16 @@ function makeThumb($item = "") {
$imgdata = null; $imgdata = null;
for ( $i=0; $i<$zip->numFiles; $i++ ) { for ( $i=0; $i<$zip->numFiles; $i++ ) {
$imgname = basename($zip->getNameIndex($i)); $imgname = basename($zip->getNameIndex($i));
$imgext = strtolower(pathinfo($imgname)['extension']); $parts = pathinfo($imgname);
if ( (strcmp($lowest, $imgname) > 0) if ( isset($parts['extension']) ) {
&& ((strcasecmp($imgext, "jpg") == 0) $imgext = strtolower($parts['extension']);
|| (strcasecmp($imgext, "png") == 0) if ( (strcmp($lowest, $imgname) > 0)
|| (strcasecmp($imgext, "webp") == 0)) ) { && ((strcasecmp($imgext, "jpg") == 0)
$lowest = $imgname; || (strcasecmp($imgext, "png") == 0)
$imgdata = $zip->getFromIndex($i); || (strcasecmp($imgext, "webp") == 0)) ) {
$lowest = $imgname;
$imgdata = $zip->getFromIndex($i);
}
} }
} }
$zip->close(); $zip->close();
@ -74,14 +77,17 @@ function makeThumb($item = "") {
$lowest = "~"; $lowest = "~";
foreach ( $entries as $entry ) { foreach ( $entries as $entry ) {
$imgname = $entry->getName(); $imgname = $entry->getName();
$imgext = strtolower(pathinfo($imgname)['extension']); $parts = pathinfo($imgname);
if ( (strcmp($lowest, $imgname) > 0) if ( isset($parts['extension']) ) {
&& ((strcasecmp($imgext, "jpg") == 0) $imgext = strtolower($parts['extension']);
|| (strcasecmp($imgext, "png") == 0) if ( (strcmp($lowest, $imgname) > 0)
|| (strcasecmp($imgext, "webp") == 0)) ) { && ((strcasecmp($imgext, "jpg") == 0)
$lowest = $imgname; || (strcasecmp($imgext, "png") == 0)
$didwrite = $entry->extract(false, $outfile); || (strcasecmp($imgext, "webp") == 0)) ) {
if ( !$didwrite ) { return false; } $lowest = $imgname;
$didwrite = $entry->extract(false, $outfile);
if ( !$didwrite ) { return false; }
}
} }
} }
rar_close($rar_file); rar_close($rar_file);

View File

@ -12,6 +12,7 @@ var lightbox = null;
function getFolderContents() { function getFolderContents() {
$("#list").html(""); $("#list").html("");
toastr.info("Loading folder contents. Comics containing a large number of issues, or issues with a large number of pages, that have not been opened recently may take some time to load. Thank you for your patience!", "Loading Contents...", {timeOut: 15000});
$.ajax({ $.ajax({
url : 'ajax/getfoldercontents.php', url : 'ajax/getfoldercontents.php',
dataType : 'json', dataType : 'json',