Funkwhale/ultrasonic-app-subsonic-android
1
0
Fork 0
mirror of https://github.com/ultrasonic/ultrasonic synced 2025-02-17 04:00:39 +01:00
Code Issues Releases Wiki Activity

Merge pull request #4 from inkognito13/defect/offline-mode-fix

Browse Source 
Not add track number prefix to filename if its already added
This commit is contained in:
Óscar García Amor 2017-07-12 15:03:56 +02:00 committed by GitHub
commit 1afeafe1c6
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ultrasonic/src/main/java/org/moire/ultrasonic/util/FileUtil.java
View File

@ -40,6 +40,7 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.SortedSet; import java.util.SortedSet;
import java.util.TreeSet; import java.util.TreeSet;
import java.util.regex.Pattern;
/** /**
* @author Sindre Mehus * @author Sindre Mehus
@ -53,6 +54,7 @@ public class FileUtil
private static final List<String> VIDEO_FILE_EXTENSIONS = Arrays.asList("flv", "mp4", "m4v", "wmv", "avi", "mov", "mpg", "mkv"); private static final List<String> VIDEO_FILE_EXTENSIONS = Arrays.asList("flv", "mp4", "m4v", "wmv", "avi", "mov", "mpg", "mkv");
private static final List<String> PLAYLIST_FILE_EXTENSIONS = Collections.singletonList("m3u"); private static final List<String> PLAYLIST_FILE_EXTENSIONS = Collections.singletonList("m3u");
private static final File DEFAULT_MUSIC_DIR = createDirectory("music"); private static final File DEFAULT_MUSIC_DIR = createDirectory("music");
private static final Pattern TITLE_WITH_TRACK = Pattern.compile("^\\d\\d-.*");
public static File getSongFile(Context context, MusicDirectory.Entry song) public static File getSongFile(Context context, MusicDirectory.Entry song)
{ {
@ -61,16 +63,15 @@ public class FileUtil
StringBuilder fileName = new StringBuilder(256); StringBuilder fileName = new StringBuilder(256);
Integer track = song.getTrack(); Integer track = song.getTrack();
if (track != null) if (!TITLE_WITH_TRACK.matcher(song.getTitle()).matches()) {//check if filename already had track number
{ if (track != null) {
if (track < 10) if (track < 10) {
{ fileName.append('0');
fileName.append('0'); }
fileName.append(track).append('-');
} }
fileName.append(track).append('-');
} }
fileName.append(fileSystemSafe(song.getTitle())).append('.'); fileName.append(fileSystemSafe(song.getTitle())).append('.');
if (song.getTranscodedSuffix() != null) if (song.getTranscodedSuffix() != null)