diff options
author | daniel oeh <daniel.oeh@gmail.com> | 2013-08-03 21:14:21 +0200 |
---|---|---|
committer | daniel oeh <daniel.oeh@gmail.com> | 2013-08-03 21:14:21 +0200 |
commit | 356357373784e00ff6e06d36a3beaf3cdb562102 (patch) | |
tree | c18654e442eee5e604c646034617240738064ed8 /src/de | |
parent | 62961d6594687eb34e36adaeba55a90c99e2dd4e (diff) | |
parent | 92a0b322da7ce88447d8d8489fa0b931af99e00c (diff) | |
download | AntennaPod-356357373784e00ff6e06d36a3beaf3cdb562102.zip |
Merge into develop
Diffstat (limited to 'src/de')
-rw-r--r-- | src/de/danoeh/antennapod/storage/DownloadRequester.java | 28 |
1 files changed, 25 insertions, 3 deletions
diff --git a/src/de/danoeh/antennapod/storage/DownloadRequester.java b/src/de/danoeh/antennapod/storage/DownloadRequester.java index 29bd764dd..fb011d238 100644 --- a/src/de/danoeh/antennapod/storage/DownloadRequester.java +++ b/src/de/danoeh/antennapod/storage/DownloadRequester.java @@ -5,6 +5,7 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.io.FilenameUtils; +import org.apache.commons.lang3.text.ExtendedMessageFormat; import android.content.Context; import android.content.Intent; @@ -61,7 +62,7 @@ public class DownloadRequester { .getName()) + "-" + i - + "." + + FilenameUtils.EXTENSION_SEPARATOR + FilenameUtils.getExtension(dest.getName()); if (AppConfig.DEBUG) Log.d(TAG, "Testing filename " + newName); @@ -289,8 +290,29 @@ public class DownloadRequester { } public String getMediafilename(FeedMedia media) { - return URLUtil.guessFileName(media.getDownload_url(), null, - media.getMime_type()); + String filename; + String titleBaseFilename = ""; + + // Try to generate the filename by the item title + if (media.getItem() != null && media.getItem().getTitle() != null) { + String title = media.getItem().getTitle(); + // Delete reserved characters + titleBaseFilename = title.replaceAll("[\\\\/%\\?\\*:|<>\"\\p{Cntrl}]", ""); + titleBaseFilename = titleBaseFilename.trim(); + } + + String URLBaseFilename = URLUtil.guessFileName(media.getDownload_url(), + null, media.getMime_type());; + + if (titleBaseFilename != "") { + // Append extension + filename = titleBaseFilename + FilenameUtils.EXTENSION_SEPARATOR + + FilenameUtils.getExtension(URLBaseFilename); + } else { + // Fall back on URL file name + filename = URLBaseFilename; + } + return filename; } } |