Merge branch 'better_file_names' into develop
This commit is contained in:
commit
b84c933bf9
|
@ -4,6 +4,8 @@ import java.io.File;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
|
import org.apache.commons.io.FilenameUtils;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
@ -14,7 +16,7 @@ import de.danoeh.antennapod.feed.FeedFile;
|
||||||
import de.danoeh.antennapod.feed.FeedImage;
|
import de.danoeh.antennapod.feed.FeedImage;
|
||||||
import de.danoeh.antennapod.feed.FeedMedia;
|
import de.danoeh.antennapod.feed.FeedMedia;
|
||||||
import de.danoeh.antennapod.service.download.DownloadService;
|
import de.danoeh.antennapod.service.download.DownloadService;
|
||||||
import de.danoeh.antennapod.util.NumberGenerator;
|
import de.danoeh.antennapod.util.FileNameGenerator;
|
||||||
import de.danoeh.antennapod.util.URLChecker;
|
import de.danoeh.antennapod.util.URLChecker;
|
||||||
|
|
||||||
public class DownloadRequester {
|
public class DownloadRequester {
|
||||||
|
@ -44,12 +46,40 @@ public class DownloadRequester {
|
||||||
return downloader;
|
return downloader;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void download(Context context, FeedFile item, File dest) {
|
private void download(Context context, FeedFile item, File dest,
|
||||||
|
boolean overwriteIfExists) {
|
||||||
if (!isDownloadingFile(item)) {
|
if (!isDownloadingFile(item)) {
|
||||||
if (dest.exists()) {
|
if (dest.exists()) {
|
||||||
if (AppConfig.DEBUG)
|
if (AppConfig.DEBUG)
|
||||||
Log.d(TAG, "File already exists. Deleting !");
|
Log.d(TAG, "File already exists.");
|
||||||
dest.delete();
|
if (overwriteIfExists) {
|
||||||
|
boolean result = dest.delete();
|
||||||
|
if (AppConfig.DEBUG)
|
||||||
|
Log.d(TAG, "Deleting file. Result: " + result);
|
||||||
|
} else {
|
||||||
|
// find different name
|
||||||
|
File newDest = null;
|
||||||
|
for (int i = 1; i < Integer.MAX_VALUE; i++) {
|
||||||
|
String newName = FilenameUtils.getBaseName(dest
|
||||||
|
.getName())
|
||||||
|
+ "-"
|
||||||
|
+ i
|
||||||
|
+ "."
|
||||||
|
+ FilenameUtils.getExtension(dest.getName());
|
||||||
|
if (AppConfig.DEBUG)
|
||||||
|
Log.d(TAG, "Testing filename " + newName);
|
||||||
|
newDest = new File(dest.getParent(), newName);
|
||||||
|
if (!newDest.exists()) {
|
||||||
|
if (AppConfig.DEBUG)
|
||||||
|
Log.d(TAG, "File doesn't exist yet. Using "
|
||||||
|
+ newName);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (newDest != null) {
|
||||||
|
dest = newDest;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (AppConfig.DEBUG)
|
if (AppConfig.DEBUG)
|
||||||
Log.d(TAG,
|
Log.d(TAG,
|
||||||
|
@ -82,7 +112,7 @@ public class DownloadRequester {
|
||||||
throws DownloadRequestException {
|
throws DownloadRequestException {
|
||||||
if (feedFileValid(feed)) {
|
if (feedFileValid(feed)) {
|
||||||
download(context, feed, new File(getFeedfilePath(context),
|
download(context, feed, new File(getFeedfilePath(context),
|
||||||
getFeedfileName(feed)));
|
getFeedfileName(feed)), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -90,15 +120,16 @@ public class DownloadRequester {
|
||||||
throws DownloadRequestException {
|
throws DownloadRequestException {
|
||||||
if (feedFileValid(image)) {
|
if (feedFileValid(image)) {
|
||||||
download(context, image, new File(getImagefilePath(context),
|
download(context, image, new File(getImagefilePath(context),
|
||||||
getImagefileName(image)));
|
getImagefileName(image)), true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void downloadMedia(Context context, FeedMedia feedmedia) throws DownloadRequestException {
|
public void downloadMedia(Context context, FeedMedia feedmedia)
|
||||||
|
throws DownloadRequestException {
|
||||||
if (feedFileValid(feedmedia)) {
|
if (feedFileValid(feedmedia)) {
|
||||||
download(context, feedmedia,
|
download(context, feedmedia,
|
||||||
new File(getMediafilePath(context, feedmedia),
|
new File(getMediafilePath(context, feedmedia),
|
||||||
getMediafilename(feedmedia)));
|
getMediafilename(feedmedia)), false);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -199,7 +230,11 @@ public class DownloadRequester {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getFeedfileName(Feed feed) {
|
public String getFeedfileName(Feed feed) {
|
||||||
return "feed-" + NumberGenerator.generateLong(feed.getDownload_url());
|
String filename = feed.getDownload_url();
|
||||||
|
if (feed.getTitle() != null && !feed.getTitle().isEmpty()) {
|
||||||
|
filename = feed.getTitle();
|
||||||
|
}
|
||||||
|
return "feed-" + FileNameGenerator.generateFileName(filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getImagefilePath(Context context)
|
public String getImagefilePath(Context context)
|
||||||
|
@ -209,7 +244,11 @@ public class DownloadRequester {
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getImagefileName(FeedImage image) {
|
public String getImagefileName(FeedImage image) {
|
||||||
return "image-" + NumberGenerator.generateLong(image.getDownload_url());
|
String filename = image.getDownload_url();
|
||||||
|
if (image.getFeed() != null && image.getFeed().getTitle() != null) {
|
||||||
|
filename = image.getFeed().getTitle();
|
||||||
|
}
|
||||||
|
return "image-" + FileNameGenerator.generateFileName(filename);
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getMediafilePath(Context context, FeedMedia media)
|
public String getMediafilePath(Context context, FeedMedia media)
|
||||||
|
@ -217,7 +256,7 @@ public class DownloadRequester {
|
||||||
File externalStorage = getExternalFilesDirOrThrowException(
|
File externalStorage = getExternalFilesDirOrThrowException(
|
||||||
context,
|
context,
|
||||||
MEDIA_DOWNLOADPATH
|
MEDIA_DOWNLOADPATH
|
||||||
+ NumberGenerator.generateLong(media.getItem()
|
+ FileNameGenerator.generateFileName(media.getItem()
|
||||||
.getFeed().getTitle()) + "/");
|
.getFeed().getTitle()) + "/");
|
||||||
return externalStorage.toString();
|
return externalStorage.toString();
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,36 @@
|
||||||
|
package de.danoeh.antennapod.util;
|
||||||
|
|
||||||
|
import java.util.Arrays;
|
||||||
|
|
||||||
|
/** Generates valid filenames for a given string. */
|
||||||
|
public class FileNameGenerator {
|
||||||
|
|
||||||
|
private static final char[] ILLEGAL_CHARACTERS = { '/', '\\', '?', '%',
|
||||||
|
'*', ':', '|', '"', '<', '>' };
|
||||||
|
static {
|
||||||
|
Arrays.sort(ILLEGAL_CHARACTERS);
|
||||||
|
}
|
||||||
|
|
||||||
|
private FileNameGenerator() {
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This method will return a new string that doesn't contain any illegal
|
||||||
|
* characters of the given string.
|
||||||
|
*/
|
||||||
|
public static String generateFileName(String string) {
|
||||||
|
StringBuilder builder = new StringBuilder();
|
||||||
|
for (int i = 0; i < string.length(); i++) {
|
||||||
|
char c = string.charAt(i);
|
||||||
|
if (Arrays.binarySearch(ILLEGAL_CHARACTERS, c) < 0) {
|
||||||
|
builder.append(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return builder.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static long generateLong(final String str) {
|
||||||
|
return str.hashCode();
|
||||||
|
}
|
||||||
|
}
|
|
@ -1,21 +0,0 @@
|
||||||
package de.danoeh.antennapod.util;
|
|
||||||
|
|
||||||
|
|
||||||
/**Utility class for creating numbers.*/
|
|
||||||
public final class NumberGenerator {
|
|
||||||
/** Class shall not be instantiated.*/
|
|
||||||
private NumberGenerator() {
|
|
||||||
}
|
|
||||||
|
|
||||||
/**Logging tag.*/
|
|
||||||
private static final String TAG = "NumberGenerator";
|
|
||||||
|
|
||||||
/** Takes a string and generates a random value out of
|
|
||||||
* the hash-value of that string.
|
|
||||||
* @param strSeed The string to take for the return value
|
|
||||||
* @return The generated random value
|
|
||||||
* */
|
|
||||||
public static long generateLong(final String strSeed) {
|
|
||||||
return strSeed.hashCode();
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -0,0 +1,48 @@
|
||||||
|
package de.danoeh.antennapod.test;
|
||||||
|
|
||||||
|
import java.io.File;
|
||||||
|
import java.io.IOException;
|
||||||
|
|
||||||
|
import de.danoeh.antennapod.util.FileNameGenerator;
|
||||||
|
import android.test.AndroidTestCase;
|
||||||
|
|
||||||
|
public class FilenameGeneratorTest extends AndroidTestCase {
|
||||||
|
|
||||||
|
private static final String VALID1 = "abc abc";
|
||||||
|
private static final String INVALID1 = "ab/c: <abc";
|
||||||
|
|
||||||
|
public void testGenerateFileName() throws IOException {
|
||||||
|
String result = FileNameGenerator.generateFileName(VALID1);
|
||||||
|
assertEquals(result, VALID1);
|
||||||
|
createFiles(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void testGenerateFileName1() throws IOException {
|
||||||
|
String result = FileNameGenerator.generateFileName(INVALID1);
|
||||||
|
assertEquals(result, VALID1);
|
||||||
|
createFiles(result);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Tests if files can be created.
|
||||||
|
*
|
||||||
|
* @throws IOException
|
||||||
|
*/
|
||||||
|
private void createFiles(String name) throws IOException {
|
||||||
|
File cache = getContext().getExternalCacheDir();
|
||||||
|
File testFile = new File(cache, name);
|
||||||
|
testFile.mkdir();
|
||||||
|
assertTrue(testFile.exists());
|
||||||
|
testFile.delete();
|
||||||
|
assertTrue(testFile.createNewFile());
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
protected void tearDown() throws Exception {
|
||||||
|
super.tearDown();
|
||||||
|
File f = new File(getContext().getExternalCacheDir(), VALID1);
|
||||||
|
f.delete();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
Loading…
Reference in New Issue