add method for setting downloaded file name prefix

krishna · krishna · commit 59c15ea7c8b9 · 2019-02-26T15:07:52.000+05:30
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
     defaultConfig {
         applicationId "com.krishna.fileloadersample"
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -23,7 +23,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.github.bumptech.glide:glide:4.1.1'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.1.1'
-    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:appcompat-v7:28.0.0'
     testCompile 'junit:junit:4.12'
 //    compile 'com.github.kk121:File-Loader:1.1'
     implementation project(':fileloader')
diff --git a/app/src/main/java/com/krishna/fileloadersample/MainActivity.java b/app/src/main/java/com/krishna/fileloadersample/MainActivity.java
@@ -100,6 +100,7 @@ public void onError(FileLoadRequest request, Throwable t) {
 
         final MultiFileDownloader multiFileDownloader = FileLoader.multiFileDownload(this);
         multiFileDownloader.checkFileintegrity(true);
+        multiFileDownloader.setFileNamesPrefix("1");
         multiFileDownloader.progressListener(new MultiFileDownloadListener() {
             @Override
             public void onProgress(File downloadedFile, int progress, int totalFiles) {
diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/fileloader/build.gradle b/fileloader/build.gradle
@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.kk121'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 3
         versionName "1.2"
 
@@ -26,10 +26,10 @@ android {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.squareup.okhttp3:okhttp:3.9.0'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.9.0'
-    compile 'com.google.code.gson:gson:2.8.1'
-    compile 'com.android.support:support-annotations:27.0.1'
+    compile 'com.squareup.okhttp3:okhttp:3.10.0'
+    compile 'com.squareup.okhttp3:logging-interceptor:3.10.0'
+    compile 'com.google.code.gson:gson:2.8.5'
+    compile 'com.android.support:support-annotations:28.0.0'
 
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
diff --git a/fileloader/src/main/java/com/krishna/fileloader/FileLoader.java b/fileloader/src/main/java/com/krishna/fileloader/FileLoader.java
@@ -122,7 +122,7 @@ public void loadFileAsync() {
     public int deleteFiles() throws Exception {
         int fileCount = 0;
         for (String fileUri : fileDeleteRequest.getFileUriList()) {
-            File file = AndroidFileManager.getFileForRequest(context, fileUri, fileDeleteRequest.getDirectoryName(), fileDeleteRequest.getDirectoryType());
+            File file = AndroidFileManager.getFileForRequest(context, fileUri, fileDeleteRequest.getFileNamePrefix(), fileDeleteRequest.getDirectoryName(), fileDeleteRequest.getDirectoryType());
             if (file.exists()) {
                 file.delete();
                 fileCount++;
@@ -149,7 +149,7 @@ public int deleteAllFilesExcept() throws Exception {
         Set<String> filesToKeepSet = new HashSet<>();
         for (String fileUri : fileDeleteRequest.getFileUriList()) {
             try {
-                filesToKeepSet.add(AndroidFileManager.getFileName(fileUri));
+                filesToKeepSet.add(AndroidFileManager.getFileName(fileUri, fileDeleteRequest.getFileNamePrefix()));
             } catch (Exception e) {
                 //ignore
             }
@@ -282,13 +282,13 @@ protected DownloadResponse doInBackground(Void... voids) {
                     if (!fileLoadRequest.isForceLoadFromNetwork()) {
                         //search file locally
                         publishProgress(STATUS_START_LOCAL_SEARCH);
-                        loadedFile = AndroidFileManager.searchAndGetLocalFile(context, fileLoadRequest.getUri(),
+                        loadedFile = AndroidFileManager.searchAndGetLocalFile(context, fileLoadRequest.getUri(), fileLoadRequest.getFileNamePrefix(),
                                 fileLoadRequest.getDirectoryName(), fileLoadRequest.getDirectoryType());
                     }
                     if (loadedFile == null || !loadedFile.exists() || fileLoadRequest.isAutoRefresh()) {
                         //download from internet
                         publishProgress(STATUS_START_DOWNLOADING);
-                        FileDownloader downloader = new FileDownloader(context, fileLoadRequest.getUri(), fileLoadRequest.getDirectoryName(), fileLoadRequest.getDirectoryType());
+                        FileDownloader downloader = new FileDownloader(context, fileLoadRequest.getUri(),fileLoadRequest.getFileNamePrefix(), fileLoadRequest.getDirectoryName(), fileLoadRequest.getDirectoryType());
                         loadedFile = downloader.download(fileLoadRequest.isAutoRefresh(), fileLoadRequest.isCheckIntegrity());
                         publishProgress(STATUS_DOWNLOAD_END);
                     }
diff --git a/fileloader/src/main/java/com/krishna/fileloader/MultiFileDownloadTask.java b/fileloader/src/main/java/com/krishna/fileloader/MultiFileDownloadTask.java
@@ -35,8 +35,8 @@ protected Void doInBackground(MultiFileLoadRequest... requests) {
         totalTasks = requests.length;
         for (MultiFileLoadRequest loadRequest : requests) {
             try {
-                File downloadedFile = AndroidFileManager.searchAndGetLocalFile(context, loadRequest.getUri(), loadRequest.getDirectoryName(), loadRequest.getDirectoryType());
-                FileDownloader downloader = new FileDownloader(context, loadRequest.getUri(), loadRequest.getDirectoryName(), loadRequest.getDirectoryType());
+                File downloadedFile = AndroidFileManager.searchAndGetLocalFile(context, loadRequest.getUri(), loadRequest.getFileNamePrefix(), loadRequest.getDirectoryName(), loadRequest.getDirectoryType());
+                FileDownloader downloader = new FileDownloader(context, loadRequest.getUri(), loadRequest.getFileNamePrefix(), loadRequest.getDirectoryName(), loadRequest.getDirectoryType());
                 if (loadRequest.isForceLoadFromNetwork() || downloadedFile == null || !downloadedFile.exists()) {
                     downloadedFile = downloader.download(false, loadRequest.isCheckIntegrity());
                 } else if (loadRequest.isAutoRefresh()) {
diff --git a/fileloader/src/main/java/com/krishna/fileloader/builder/FileLoaderBuilder.java b/fileloader/src/main/java/com/krishna/fileloader/builder/FileLoaderBuilder.java
@@ -30,6 +30,7 @@ public class FileLoaderBuilder {
     private boolean forceLoadFromNetwork;
     private boolean autoRefresh;
     private boolean checkIntegrity;
+    private String fileNamePrefix = "";
 
 
     public FileLoaderBuilder(Context context) {
@@ -51,6 +52,10 @@ public FileLoaderBuilder load(String uri, boolean forceLoadFromNetwork) {
         return load(uri);
     }
 
+    public void setFileNamePrefix(String fileNamePrefix) {
+        this.fileNamePrefix = fileNamePrefix;
+    }
+
     public FileLoaderBuilder fromDirectory(String directoryName, @FileLoader.DirectoryType int directoryType) {
         this.directoryName = directoryName;
         this.directoryType = directoryType;
@@ -117,6 +122,6 @@ public void asObject(FileRequestListener<? extends Object> listener) {
 
     private void buildFileLoader() {
         fileLoader = new FileLoader(context);
-        fileLoader.setFileLoadRequest(new FileLoadRequest(uri, directoryName, directoryType, returnFileType, requestClass, fileExtension, forceLoadFromNetwork, autoRefresh, checkIntegrity, listener));
+        fileLoader.setFileLoadRequest(new FileLoadRequest(uri, directoryName, directoryType, returnFileType, requestClass, fileExtension, forceLoadFromNetwork, autoRefresh, checkIntegrity, listener, fileNamePrefix));
     }
 }
diff --git a/fileloader/src/main/java/com/krishna/fileloader/builder/MultiFileDownloader.java b/fileloader/src/main/java/com/krishna/fileloader/builder/MultiFileDownloader.java
@@ -23,6 +23,7 @@ public class MultiFileDownloader {
     private boolean forceLoadFromNetwork;
     private boolean autoRefresh;
     private boolean checkIntegrity;
+    private String fileNamesPrefix = "";
     private MultiFileDownloadTask multiFileDownloadTask;
 
     public MultiFileDownloader(Context context) {
@@ -56,6 +57,7 @@ public void loadMultiple(String... uris) {
             MultiFileLoadRequest loadRequest = new MultiFileLoadRequest(uris[i], directoryName, directoryType, forceLoadFromNetwork);
             loadRequest.setAutoRefresh(autoRefresh);
             loadRequest.setCheckIntegrity(checkIntegrity);
+            loadRequest.setFileNamePrefix(fileNamesPrefix);
             loadRequestArr[i] = loadRequest;
         }
         multiFileDownloadTask = new MultiFileDownloadTask(context, listener);
@@ -73,6 +75,7 @@ public void loadMultiple(boolean forceLoadFromNetwork, List<MultiFileLoadRequest
         for (int i = 0; i < multiFileLoadRequestList.size(); i++) {
             loadRequestArr[i] = multiFileLoadRequestList.get(i);
             loadRequestArr[i].setAutoRefresh(autoRefresh);
+            loadRequestArr[i].setFileNamePrefix(fileNamesPrefix);
             loadRequestArr[i].setCheckIntegrity(checkIntegrity);
         }
         multiFileDownloadTask = new MultiFileDownloadTask(context, listener);
@@ -87,4 +90,8 @@ public void cancelLoad() {
         if (multiFileDownloadTask != null)
             multiFileDownloadTask.cancel(true);
     }
+
+    public void setFileNamesPrefix(String fileNamesPrefix) {
+        this.fileNamesPrefix = fileNamesPrefix;
+    }
 }
diff --git a/fileloader/src/main/java/com/krishna/fileloader/network/FileDownloader.java b/fileloader/src/main/java/com/krishna/fileloader/network/FileDownloader.java
@@ -32,12 +32,14 @@ public class FileDownloader {
     private int dirType;
     private static OkHttpClient httpClient;
     private Context context;
+    private String fileNamePrefix = "";
 
-    public FileDownloader(Context context, String uri, String dirName, int dirType) {
+    public FileDownloader(Context context, String uri, String fileNamePrefix, String dirName, int dirType) {
         this.context = context.getApplicationContext();
         this.uri = uri;
         this.dirName = dirName;
         this.dirType = dirType;
+        this.fileNamePrefix = fileNamePrefix;
         initHttpClient();
     }
 
@@ -62,7 +64,7 @@ public File download(boolean autoRefresh, boolean checkIntegrity) throws Excepti
         Request.Builder requestBuilder = new Request.Builder().url(uri);
 
         //if auto-refresh is enabled then add header "If-Modified-Since" to the request and send last modified time of local file
-        File downloadFilePath = AndroidFileManager.getFileForRequest(context, uri, dirName, dirType);
+        File downloadFilePath = AndroidFileManager.getFileForRequest(context, uri, fileNamePrefix, dirName, dirType);
         if (autoRefresh) {
             String lastModifiedTime = Utils.getLastModifiedTime(downloadFilePath.lastModified());
             if (lastModifiedTime != null) {
@@ -85,7 +87,7 @@ public File download(boolean autoRefresh, boolean checkIntegrity) throws Excepti
         //if file already exists, delete it
         if (downloadFilePath.exists()) {
             if (downloadFilePath.delete())
-                downloadFilePath = AndroidFileManager.getFileForRequest(context, uri, dirName, dirType);
+                downloadFilePath = AndroidFileManager.getFileForRequest(context, uri, fileNamePrefix, dirName, dirType);
         }
 
         //write the body to file
diff --git a/fileloader/src/main/java/com/krishna/fileloader/request/FileDeleteRequest.java b/fileloader/src/main/java/com/krishna/fileloader/request/FileDeleteRequest.java
@@ -10,6 +10,7 @@ public class FileDeleteRequest {
     private ArrayList<String> fileUriList;
     private String directoryName;
     private int directoryType;
+    private String fileNamePrefix = "";
 
     public FileDeleteRequest(ArrayList<String> fileUriList, String directoryName, int directoryType) {
         this.fileUriList = fileUriList;
@@ -40,4 +41,12 @@ public int getDirectoryType() {
     public void setDirectoryType(int directoryType) {
         this.directoryType = directoryType;
     }
+
+    public String getFileNamePrefix() {
+        return fileNamePrefix;
+    }
+
+    public void setFileNamePrefix(String fileNamePrefix) {
+        this.fileNamePrefix = fileNamePrefix;
+    }
 }
diff --git a/fileloader/src/main/java/com/krishna/fileloader/request/FileLoadRequest.java b/fileloader/src/main/java/com/krishna/fileloader/request/FileLoadRequest.java
@@ -30,6 +30,7 @@ public class FileLoadRequest {
     private boolean forceLoadFromNetwork;
     private boolean autoRefresh;
     private boolean checkIntegrity;
+    private String fileNamePrefix = "";
     private FileRequestListener requestListener;
 
     public FileLoadRequest(String uri, String directoryName, int directoryType, int fileType, Class requestClass, String fileExtension, boolean forceLoadFromNetwork, FileRequestListener listener) {
@@ -43,10 +44,11 @@ public FileLoadRequest(String uri, String directoryName, int directoryType, int
         this.requestListener = listener;
     }
 
-    public FileLoadRequest(String uri, String directoryName, int directoryType, int fileType, Class requestClass, String fileExtension, boolean forceLoadFromNetwork, boolean autoRefresh, boolean checkIntegrity, FileRequestListener listener) {
+    public FileLoadRequest(String uri, String directoryName, int directoryType, int fileType, Class requestClass, String fileExtension, boolean forceLoadFromNetwork, boolean autoRefresh, boolean checkIntegrity, FileRequestListener listener, String fileNamePrefix) {
         this(uri, directoryName, directoryType, fileType, requestClass, fileExtension, forceLoadFromNetwork, listener);
         this.autoRefresh = autoRefresh;
         this.checkIntegrity = checkIntegrity;
+        this.fileNamePrefix = fileNamePrefix;
     }
 
     public FileLoadRequest(String uri, String directoryName, int directoryType) {
@@ -135,6 +137,14 @@ public void setCheckIntegrity(boolean checkIntegrity) {
         this.checkIntegrity = checkIntegrity;
     }
 
+    public String getFileNamePrefix() {
+        return fileNamePrefix;
+    }
+
+    public void setFileNamePrefix(String fileNamePrefix) {
+        this.fileNamePrefix = fileNamePrefix;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/fileloader/src/main/java/com/krishna/fileloader/request/MultiFileLoadRequest.java b/fileloader/src/main/java/com/krishna/fileloader/request/MultiFileLoadRequest.java
@@ -11,6 +11,7 @@ public class MultiFileLoadRequest {
     private boolean forceLoadFromNetwork;
     private boolean autoRefresh;
     private boolean checkIntegrity;
+    private String fileNamePrefix;
 
     /**
      * @param uri                  Url of the image to download (ex. https://images.pexels.com/photos/45170/kittens-cat-cat-puppy-rush-45170.jpeg)
@@ -19,10 +20,15 @@ public class MultiFileLoadRequest {
      * @param forceLoadFromNetwork if true, it will ignore the local file if exists and re-download else returns the existing file
      */
     public MultiFileLoadRequest(String uri, String directoryName, int directoryType, boolean forceLoadFromNetwork) {
+        this(uri, directoryName, directoryType, forceLoadFromNetwork, "");
+    }
+
+    public MultiFileLoadRequest(String uri, String directoryName, int directoryType, boolean forceLoadFromNetwork, String fileNamePrefix) {
         this.uri = uri;
         this.directoryName = directoryName;
         this.directoryType = directoryType;
         this.forceLoadFromNetwork = forceLoadFromNetwork;
+        this.fileNamePrefix = fileNamePrefix;
     }
 
     public String getUri() {
@@ -72,4 +78,12 @@ public boolean isCheckIntegrity() {
     public void setCheckIntegrity(boolean checkIntegrity) {
         this.checkIntegrity = checkIntegrity;
     }
+
+    public String getFileNamePrefix() {
+        return fileNamePrefix;
+    }
+
+    public void setFileNamePrefix(String fileNamePrefix) {
+        this.fileNamePrefix = fileNamePrefix;
+    }
 }
diff --git a/fileloader/src/main/java/com/krishna/fileloader/utility/AndroidFileManager.java b/fileloader/src/main/java/com/krishna/fileloader/utility/AndroidFileManager.java
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ buildscript {`
`6`	`6`	`jcenter()`
`7`	`7`	`}`
`8`	`8`	`dependencies {`
`9`		`- classpath 'com.android.tools.build:gradle:3.1.4'`
	`9`	`+ classpath 'com.android.tools.build:gradle:3.3.1'`
`10`	`10`	`// NOTE: Do not place your application dependencies here; they belong`
`11`	`11`	`// in the individual module build.gradle files`
`12`	`12`	`}`