Nekojimi
/
Chords
1
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Wiki Activity

Add support for downloading tracks to a permanent location.

This commit is contained in:
Nekojimi 2024-04-21 16:45:39 +01:00
parent 3da1c95453
commit 88c51129d2
1 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/main/java/moe/nekojimi/chords/Downloader.java
View File

@ -60,7 +60,8 @@ public class Downloader extends QueueThing<TrackRequest, Track>
// private Consumer<Track> next; // private Consumer<Track> next;
private BiConsumer<TrackRequest, Exception> messageHandler; private BiConsumer<TrackRequest, Exception> messageHandler;
private File downloadDir = null; private File temporaryDownloadDir = null;
private File permanentDownloadDir = null;
private int trackNumber = 1; private int trackNumber = 1;
@ -313,9 +314,24 @@ public class Downloader extends QueueThing<TrackRequest, Track>
private File getDownloadDir() throws IOException private File getDownloadDir() throws IOException
{ {
if (downloadDir == null || !downloadDir.exists() || !downloadDir.canWrite()) return getDownloadDir(false);
downloadDir = Files.createTempDirectory("chords").toFile(); }
return downloadDir;
private File getDownloadDir(boolean permanent) throws IOException
{
if (permanent)
{
if (permanentDownloadDir == null)
permanentDownloadDir = new File("tracks");
if (!permanentDownloadDir.exists())
Files.createDirectory(permanentDownloadDir.toPath());
return permanentDownloadDir;
} else
{
if (temporaryDownloadDir == null || !temporaryDownloadDir.exists() || !temporaryDownloadDir.canWrite())
temporaryDownloadDir = Files.createTempDirectory("chords").toFile();
return temporaryDownloadDir;
}
} }
private Track getTrackFromRequest(TrackRequest request, int idx) private Track getTrackFromRequest(TrackRequest request, int idx)
@ -325,6 +341,7 @@ public class Downloader extends QueueThing<TrackRequest, Track>
{ {
Track track = new Track(request); Track track = new Track(request);
track.setNumber(trackNumber); track.setNumber(trackNumber);
track.setKept(request.isKeepTracks());
trackNumber++; trackNumber++;
request.addTrack(track); request.addTrack(track);
} }
@ -368,7 +385,7 @@ public class Downloader extends QueueThing<TrackRequest, Track>
cmd.add("-"); cmd.add("-");
} else } else
{ {
cmd.add("-o " + getDownloadDir().getAbsolutePath() + "/%(title)s.%(ext)s"); cmd.add("-o " + getDownloadDir(false).getAbsolutePath() + "/%(title)s.%(ext)s");
} }
cmd.add(request.getUrl().toString()); cmd.add(request.getUrl().toString());