MightyPork/airsonic-custom
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Renamed StringUtil.formatDuration to formatDurationMSS

Browse Source
This commit is contained in:
Evan Harris
2019-10-21 07:01:34 -05:00
parent 0c0561d104
commit 0660c4f3e6
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
airsonic-main/src/main/java/org/airsonic/player/ajax/PlayQueueInfo.java
+1 -1
View File
@@ -61,7 +61,7 @@ public class PlayQueueInfo {
durationSeconds += entry.getDuration();
}
}
return StringUtil.formatDuration(durationSeconds);
return StringUtil.formatDurationMSS(durationSeconds);
}
public boolean isStopEnabled() {
airsonic-main/src/main/java/org/airsonic/player/controller/VideoPlayerController.java
+1 -1
View File
@@ -89,7 +89,7 @@ public class VideoPlayerController {
public static Map<String, Integer> createSkipOffsets(int durationSeconds) {
LinkedHashMap<String, Integer> result = new LinkedHashMap<String, Integer>();
for (int i = 0; i < durationSeconds; i += 60) {
result.put(StringUtil.formatDuration(i), i);
result.put(StringUtil.formatDurationMSS(i), i);
}
return result;
}
airsonic-main/src/main/java/org/airsonic/player/domain/Playlist.java
+1 -1
View File
@@ -113,7 +113,7 @@ public class Playlist {
}
public String getDurationAsString() {
return StringUtil.formatDuration(durationSeconds);
return StringUtil.formatDurationMSS(durationSeconds);
}
public Date getCreated() {
airsonic-main/src/main/java/org/airsonic/player/util/StringUtil.java
+1 -1
View File
@@ -228,7 +228,7 @@ public final class StringUtil {
/**
* Formats a duration with minutes and seconds, e.g., "93:45"
*/
public static String formatDuration(int seconds) {
public static String formatDurationMSS(int seconds) {
int minutes = seconds / 60;
int secs = seconds % 60;
airsonic-main/src/test/java/org/airsonic/player/util/StringUtilTestCase.java
+12 -11
View File
@@ -81,17 +81,18 @@ public class StringUtilTestCase extends TestCase {
assertEquals("Error in formatBytes().", "4413,43 TB", StringUtil.formatBytes(4852617603375432L, locale));
}
public void testFormatDuration() {
assertEquals("Error in formatDuration().", "0:00", StringUtil.formatDuration(0));
assertEquals("Error in formatDuration().", "0:05", StringUtil.formatDuration(5));
assertEquals("Error in formatDuration().", "0:10", StringUtil.formatDuration(10));
assertEquals("Error in formatDuration().", "0:59", StringUtil.formatDuration(59));
assertEquals("Error in formatDuration().", "1:00", StringUtil.formatDuration(60));
assertEquals("Error in formatDuration().", "1:01", StringUtil.formatDuration(61));
assertEquals("Error in formatDuration().", "1:10", StringUtil.formatDuration(70));
assertEquals("Error in formatDuration().", "10:00", StringUtil.formatDuration(600));
assertEquals("Error in formatDuration().", "45:50", StringUtil.formatDuration(2750));
assertEquals("Error in formatDuration().", "83:45", StringUtil.formatDuration(5025));
public void testFormatDurationMSS() {
assertEquals("Error in formatDurationMSS().", "0:00", StringUtil.formatDurationMSS(0));
assertEquals("Error in formatDurationMSS().", "0:05", StringUtil.formatDurationMSS(5));
assertEquals("Error in formatDurationMSS().", "0:10", StringUtil.formatDurationMSS(10));
assertEquals("Error in formatDurationMSS().", "0:59", StringUtil.formatDurationMSS(59));
assertEquals("Error in formatDurationMSS().", "1:00", StringUtil.formatDurationMSS(60));
assertEquals("Error in formatDurationMSS().", "1:01", StringUtil.formatDurationMSS(61));
assertEquals("Error in formatDurationMSS().", "1:10", StringUtil.formatDurationMSS(70));
assertEquals("Error in formatDurationMSS().", "10:00", StringUtil.formatDurationMSS(600));
assertEquals("Error in formatDurationMSS().", "45:50", StringUtil.formatDurationMSS(2750));
assertEquals("Error in formatDurationMSS().", "83:45", StringUtil.formatDurationMSS(5025));
assertEquals("Error in formatDurationMSS().", "121:40", StringUtil.formatDurationMSS(7300));
}
public void testSplit() {