support for downloading files with extensions

Author: krishna

app/build.gradle

@@ -23,12 +23,8 @@ 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'
-
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
-        exclude group: 'com.android.support', module: 'support-annotations'
-    })
     compile 'com.android.support:appcompat-v7:26.1.0'
-    compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha9'
     testCompile 'junit:junit:4.12'
-    compile project(':fileloader')
+//    compile 'com.github.kk121:File-Loader:1.1'
+    implementation project(':fileloader')
 }

app/src/main/java/com/krishna/fileloadersample/MainActivity.java

@@ -3,6 +3,7 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Bundle;
+import android.os.Environment;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.widget.ImageView;
@@ -49,45 +50,51 @@ public void onError(FileLoadRequest request, Throwable t) {
                     }
                 });
 
+        /*try {
+            FileLoader.deleteWith(this).fromDirectory("test4", FileLoader.DIR_EXTERNAL_PUBLIC).deleteAllFiles();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }*/
 
         //Synchronous json file loading
         try {
             FileResponse response = FileLoader.with(this)
                     .load("http://echo.jsontest.com/key1/value1/key2/value2")
-                    .fromDirectory("test3", FileLoader.DIR_INTERNAL)
+                    .fromDirectory("test4", FileLoader.DIR_EXTERNAL_PUBLIC)
                     .asObject(JsonTest.class);
             JsonTest test = (JsonTest) response.getBody();
             Log.d(TAG, "" + test);
         } catch (Exception e) {
             e.printStackTrace();
         }
 
+
         final String[] uris = {"https://images.pexels.com/photos/45170/kittens-cat-cat-puppy-rush-45170.jpeg",
                 "https://upload.wikimedia.org/wikipedia/commons/3/3c/Enrique_Simonet_-_Marina_veneciana_6MB.jpg"};
         //delete files
-        try {
-            FileLoader.deleteWith(this).fromDirectory("test2", FileLoader.DIR_INTERNAL).deleteFiles(uris);
+       /* try {
+            FileLoader.deleteWith(this).fromDirectory("test4", FileLoader.DIR_EXTERNAL_PUBLIC).deleteFiles(uris);
         } catch (Exception e) {
             e.printStackTrace();
         }
 
         //delete all files from the directory
         try {
-            FileLoader.deleteWith(this).fromDirectory("test2", FileLoader.DIR_INTERNAL).deleteAllFiles();
+            FileLoader.deleteWith(this).fromDirectory("test4", FileLoader.DIR_EXTERNAL_PUBLIC).deleteAllFiles();
         } catch (Exception e) {
             e.printStackTrace();
         }
 
         //delete all files from directory except files passed in argument
         try {
-            FileLoader.deleteWith(this).fromDirectory("test3", FileLoader.DIR_INTERNAL).deleteAllFilesExcept(uris);
+            FileLoader.deleteWith(this).fromDirectory("test4", FileLoader.DIR_INTERNAL).deleteAllFilesExcept(uris);
         } catch (Exception e) {
             e.printStackTrace();
-        }
+        }*/
 
         List<MultiFileLoadRequest> multiFileLoadRequests = new ArrayList<>();
-        multiFileLoadRequests.add(new MultiFileLoadRequest(uris[0], "test2", FileLoader.DIR_EXTERNAL_PUBLIC, true));
-        multiFileLoadRequests.add(new MultiFileLoadRequest(uris[1], "test4", FileLoader.DIR_EXTERNAL_PUBLIC, true));
+        multiFileLoadRequests.add(new MultiFileLoadRequest(uris[0], Environment.DIRECTORY_PICTURES, FileLoader.DIR_EXTERNAL_PUBLIC, true));
+        multiFileLoadRequests.add(new MultiFileLoadRequest(uris[1], Environment.DIRECTORY_PICTURES, FileLoader.DIR_EXTERNAL_PUBLIC, true));
 
         final MultiFileDownloader multiFileDownloader = FileLoader.multiFileDownload(this);
         multiFileDownloader.progressListener(new MultiFileDownloadListener() {

build.gradle

@@ -16,6 +16,7 @@ allprojects {
     repositories {
         jcenter()
         google()
+        maven { url 'https://jitpack.io' }
     }
 }
 

fileloader/src/main/java/com/krishna/fileloader/FileLoader.java

@@ -36,13 +36,13 @@
 public class FileLoader {
     private static final String TAG = "FileLoader";
     // Directory type
-    public static final int DIR_INTERNAL = 1;
-    public static final int DIR_CACHE = 2;
-    public static final int DIR_EXTERNAL_PRIVATE = 3;
-    public static final int DIR_EXTERNAL_PUBLIC = 4;
+    public static final int DIR_INTERNAL = 1; //Only your app can access. { android FilesDir() }
+    public static final int DIR_CACHE = 2; // Only your app can access, can be deleted by system. { android CacheDir() }
+    public static final int DIR_EXTERNAL_PRIVATE = 3; //Accessible by all apps but not by users. { android ExternalFilesDir() }
+    public static final int DIR_EXTERNAL_PUBLIC = 4; //Accessible by all apps and users. { android ExternalStorageDirectory() }
 
     //Defaults
-    public static final int DEFAULT_DIR_TYPE = DIR_INTERNAL;
+    public static final int DEFAULT_DIR_TYPE = DIR_CACHE;
     public static final String DEFAULT_DIR_NAME = "file_loader";
 
     @IntDef({DIR_INTERNAL, DIR_CACHE, DIR_EXTERNAL_PRIVATE, DIR_EXTERNAL_PUBLIC})

fileloader/src/main/java/com/krishna/fileloader/request/MultiFileLoadRequest.java

@@ -10,6 +10,13 @@ public class MultiFileLoadRequest {
     private int directoryType;
     private boolean forceLoadFromNetwork;
 
+    /**
+     *
+     * @param uri Url of the image to download (ex. https://images.pexels.com/photos/45170/kittens-cat-cat-puppy-rush-45170.jpeg)
+     * @param directoryName Name of the directory where you want to download (like. Environment.DIRECTORY_PICTURES , Environment.DIRECTORY_DOCUMENTS, Environment.DIRECTORY_DOWNLOADS or custom directory "My Directory"
+     * @param directoryType Type of directory {@link com.krishna.fileloader.FileLoader.DirectoryType}
+     * @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 = uri;
         this.directoryName = directoryName;

fileloader/src/main/java/com/krishna/fileloader/utility/AndroidFileManager.java

@@ -32,8 +32,11 @@ public static String getFileName(String uri) throws Exception {
         String fileName;
         try {
             //passed uri is valid url, create file name as hashcode of url
-            new URL(uri);
-            fileName = String.valueOf(uri.hashCode());
+            URL url = new URL(uri);
+            fileName = getFileNameFromUrl(url);
+            if (fileName == null) {
+                fileName = String.valueOf(uri.hashCode());
+            }
         } catch (MalformedURLException e) {
             if (uri.contains("/"))
                 throw new Exception("File name should not contain path separator \"/\"");
@@ -43,6 +46,21 @@ public static String getFileName(String uri) throws Exception {
         return fileName;
     }
 
+    private static String getFileNameFromUrl(URL url) {
+        String fileName = null;
+        String path = url.getPath();
+        if (path != null) {
+            String pathArr[] = path.split("/");
+            if (pathArr.length > 0) {
+                String lastPath = pathArr[pathArr.length - 1];
+                if (Utils.isValidFileName(lastPath)) {
+                    fileName = lastPath;
+                }
+            }
+        }
+        return fileName;
+    }
+
     public static File getAppropriateDirectory(Context context, String directoryName, int directoryType) throws Exception {
         File file = null;
         switch (directoryType) {

fileloader/src/main/java/com/krishna/fileloader/utility/Utils.java

@@ -10,6 +10,7 @@
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
+import java.util.regex.Pattern;
 
 /**
  * Created by krishna on 15/10/17.
@@ -47,4 +48,9 @@ public static ThreadPoolExecutor getThreadPoolExecutor() {
         BlockingQueue<Runnable> workQueue = new LinkedBlockingQueue<Runnable>(mMaximumPoolSize);
         return new ThreadPoolExecutor(mCorePoolSize, mMaximumPoolSize, mKeepAliveTime, TimeUnit.SECONDS, workQueue);
     }
+
+    public static boolean isValidFileName(String fileName) {
+        Pattern pattern = Pattern.compile(".*\\..*");
+        return pattern.matcher(fileName).matches();
+    }
 }