From b17f6a4ab67247045a6de59c21f8c6983c7691c5 Mon Sep 17 00:00:00 2001 From: mvn23 Date: Mon, 27 Jun 2022 16:08:00 +0200 Subject: Fix album sort with duplicate track numbers --- .../java/github/daneren2005/dsub/domain/MusicDirectory.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java index bd7928fd..bba969e4 100644 --- a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java +++ b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java @@ -715,15 +715,16 @@ public class MusicDirectory implements Serializable { Integer lhsTrack = lhs.getTrack(); Integer rhsTrack = rhs.getTrack(); - if(lhsTrack != null && rhsTrack != null && lhsTrack != rhsTrack) { + if(lhsTrack == rhsTrack) { + return collator.compare(lhs.getTitle(), rhs.getTitle()); + } + if(lhsTrack != null && rhsTrack != null) { return lhsTrack.compareTo(rhsTrack); - } else if(lhsTrack != null) { + } + if(lhsTrack != null) { return -1; - } else if(rhsTrack != null) { - return 1; } - - return collator.compare(lhs.getTitle(), rhs.getTitle()); + return 1; } public static void sort(List entries) { -- cgit v1.2.3 From 21d7135cb4c1a595be8c8b73f67b5ed9345909cd Mon Sep 17 00:00:00 2001 From: mvn23 Date: Tue, 12 Jul 2022 22:31:05 +0200 Subject: Change formatting as requested --- .../main/java/github/daneren2005/dsub/domain/MusicDirectory.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java index bba969e4..a2b6d4ed 100644 --- a/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java +++ b/app/src/main/java/github/daneren2005/dsub/domain/MusicDirectory.java @@ -717,11 +717,9 @@ public class MusicDirectory implements Serializable { Integer rhsTrack = rhs.getTrack(); if(lhsTrack == rhsTrack) { return collator.compare(lhs.getTitle(), rhs.getTitle()); - } - if(lhsTrack != null && rhsTrack != null) { + } else if(lhsTrack != null && rhsTrack != null) { return lhsTrack.compareTo(rhsTrack); - } - if(lhsTrack != null) { + } else if(lhsTrack != null) { return -1; } return 1; -- cgit v1.2.3