ChomeNS/SongPlayer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Added support for subdirectories in songs folder

Browse source
This commit is contained in:
hhhzzzsss 2023-06-09 23:25:11 -05:00
parent 2bba096600
commit b37a50d365
2 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/main/java/com/github/hhhzzzsss/songplayer/CommandProcessor.java
View file

@ -15,6 +15,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.concurrent.CompletableFuture; import java.util.concurrent.CompletableFuture;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import java.util.stream.Stream;
public class CommandProcessor { public class CommandProcessor {
public static ArrayList<Command> commands = new ArrayList<>(); public static ArrayList<Command> commands = new ArrayList<>();
@ -173,11 +174,26 @@ public class CommandProcessor {
} }
} }
public CompletableFuture<Suggestions> getSuggestions(String args, SuggestionsBuilder suggestionsBuilder) { public CompletableFuture<Suggestions> getSuggestions(String args, SuggestionsBuilder suggestionsBuilder) {
List<String> filenames = Arrays.stream(SongPlayer.SONG_DIR.listFiles()) int lastSlash = args.lastIndexOf("/");
.filter(File::isFile) String dirString = "";
.map(File::getName) File dir = SongPlayer.SONG_DIR;
.collect(Collectors.toList()); if (lastSlash >= 0) {
return CommandSource.suggestMatching(filenames, suggestionsBuilder); dirString = args.substring(0, lastSlash+1);
dir = new File(dir, dirString);
}
if (!dir.exists()) return null;
ArrayList<String> suggestions = new ArrayList<>();
for (File file : dir.listFiles()) {
if (file.isFile()) {
suggestions.add(dirString + file.getName());
}
else if (file.isDirectory()) {
suggestions.add(dirString + file.getName() + "/");
}
}
return CommandSource.suggestMatching(suggestions, suggestionsBuilder);
} }
} }

3
src/main/java/com/github/hhhzzzsss/songplayer/song/SongLoaderThread.java
View file

@ -24,9 +24,6 @@ public class SongLoaderThread extends Thread{
isUrl = true; isUrl = true;
songUrl = new URL(location); songUrl = new URL(location);
} }
else if (location.contains("/") || location.contains("\\")) {
throw new IOException("Invalid characters in song name: " + location);
}
else if (getSongFile(location).exists()) { else if (getSongFile(location).exists()) {
songPath = getSongFile(location); songPath = getSongFile(location);
} }