flynx/ImageGrid
1
1
Fork 0
mirror of https://github.com/flynx/ImageGrid.git synced 2025-12-24 12:01:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

some cleanup...

Browse Source 
Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-09-23 00:08:02 +04:00
parent b06c5f05f8
commit a507511378
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/data.js
View File

@ -1787,7 +1787,7 @@ function sortImagesByFileName(reverse){
} }
// Sort images while taking into account name sequence overflows // Sort images by name while taking into account sequence overflows
// //
// A name sequence overflow is when file name sequence overflows over // A name sequence overflow is when file name sequence overflows over
// *9999 and then resets to *0001... // *9999 and then resets to *0001...
@ -1805,14 +1805,21 @@ function sortImagesByFileName(reverse){
// number of files in set // number of files in set
// XXX a simplification... // XXX a simplification...
// //
// NOTE: if any of the above conditions is not applicable this will
// essentially revert to sortImagesByFileName(...)
// NOTE: this will cut at the largest gap between sequence numbers. // NOTE: this will cut at the largest gap between sequence numbers.
// //
// XXX it's also a good idea to write an image serial number sort... // XXX it's also a good idea to write an image serial number sort...
// XXX is this overcomplicated??? // XXX is this overcomplicated???
//
// NOTE: I like this piece if code, if it works correctly no one will
// ever know it's here, if we replace it with the thee line dumb
// sortImagesByFileName(...) then things get "annoying" every 10K
// images :)
function sortImagesByNameWithSeqOverflow(reverse, proximity){ function sortImagesByNameWithSeqOverflow(reverse, proximity){
proximity = proximity == null ? 10 : proximity proximity = proximity == null ? 10 : proximity
// sort and check names... // prepare to sort and check names...
// NOTE: we do not usually have a filename seq 0000... // NOTE: we do not usually have a filename seq 0000...
if(DATA.order.length < 9999){ if(DATA.order.length < 9999){
var pattern = /....[0-9]{4}[a-z]?(\....[.])?/ var pattern = /....[0-9]{4}[a-z]?(\....[.])?/
@ -1832,8 +1839,9 @@ function sortImagesByNameWithSeqOverflow(reverse, proximity){
} }
// revert to normal sort my name... // revert to normal sort my name...
// XXX this is not needed but will make things faster...
} else { } else {
return sortImagesByName(reverse) return sortImagesByFileName(reverse)
} }
DATA.order.sort(cmp) DATA.order.sort(cmp)
@ -1842,9 +1850,6 @@ function sortImagesByNameWithSeqOverflow(reverse, proximity){
// check if first and last are close to 0001 and 9999 resp. // check if first and last are close to 0001 and 9999 resp.
&& getSeq(DATA.order[0]) <= proximity && getSeq(DATA.order[0]) <= proximity
&& getSeq(DATA.order[DATA.order.length-1]) >= 9999-proximity){ && getSeq(DATA.order[DATA.order.length-1]) >= 9999-proximity){
console.log('fixing...')
// find the largest gap position... // find the largest gap position...
var pos = null var pos = null
var gap = 0 var gap = 0
@ -1855,13 +1860,11 @@ function sortImagesByNameWithSeqOverflow(reverse, proximity){
gap = n_gap gap = n_gap
} }
} }
// split and rearrange the order chunks...
// splice...
if(gap > proximity){ if(gap > proximity){
DATA.order = DATA.order.splice(pos).concat(DATA.order) DATA.order = DATA.order.splice(pos).concat(DATA.order)
} }
} }
if(reverse){ if(reverse){
DATA.order.reverse() DATA.order.reverse()
} }