Fetching the url is made efficient

Author: SanjayDevTech

.gitignore

@@ -1,6 +1,5 @@
 *.iml
 .gradle
-github.properties
 local.properties
 /local.properties
 /.idea/caches

.idea/misc.xml

@@ -4,7 +4,7 @@ Insta Utils is a Insta post downloader for Android applications written in **Jav
 
 # New Features!
 
-  - Download the Insta public post (Only Image)
+  - Download the Insta public post
   - Set the image directly to ImageView
 
 ### Credits
@@ -17,7 +17,7 @@ Insta Utils uses a number of open source libraries to work properly:
 ### Implemetation
 
 ```gradle
-implementation 'com.sanjaydevtech.instautils:instautils:1.0.0'
+implementation 'com.sanjaydevtech.instautils:instautils:1.0.1
 ```
 
 ### Initialisation
@@ -29,6 +29,7 @@ downloader.setResponse(new InstaResponse() {
     public void onResponse(InstaPost post) {
         int type = post.getType(); // InstaPost.INSTA_IMAGE or InstaPost.INSTA_VIDEO
         String url = post.getUrl();
+        String thumbUrl = post.getThumbnailUrl();
     }
     @Override
     public void onError(Exception e) {}

README.md

@@ -13,7 +13,7 @@ ext {
     siteUrl = 'https://github.com/SanjayDevTech/instautils'
     gitUrl = 'https://github.com/SanjayDevTech/instautils.git'
 
-    libraryVersion = '1.0.0'
+    libraryVersion = '1.0.1'
 
     developerId = 'sanjaydevtech'
     developerName = 'Sanjay Developer'
@@ -32,8 +32,6 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"

instautils/build.gradle

@@ -13,29 +13,22 @@
 import com.bumptech.glide.request.transition.Transition;
 
 import org.jsoup.Jsoup;
-import org.jsoup.nodes.DataNode;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import java.io.IOException;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 /**
  * Downloader Class to download insta posts
  *
  * @author Sanjay Developer
- * @version 1.0.0
+ * @version 1.0.1
  */
 public class InstaDownloader {
     private Activity activity;
     private InstaResponse response;
     private static final String TAG = InstaDownloader.class.getSimpleName();
-    private static final String IMAGE_PATTERN = "\"src\":\"([^\"]*)\"";
-    private static final String VIDEO_PATTERN = "\"video_url\":\"([^\"]*)\"";
-    private static final String NOISE = "\\u0026";
-    private static final String POST_PATTERN = "^(https://www.instagram.com/p/[^/]+/)";
 
     /**
      * Public constructor
@@ -67,50 +60,69 @@ public void get(final String url) throws NullPointerException {
         }
         new Thread() {
             public void run() {
-                boolean isData = false;
                 try {
                     Document document = Jsoup.connect(url).userAgent("Mozilla/5.0").get();
-                    Elements scripts = document.getElementsByTag("script");
-                    for (Element script : scripts) {
-                        if (isData) {
-                            break;
+                    Elements metas = document.getElementsByTag("meta");
+                    String img = null, vid = null, type = null;
+                    for (Element meta : metas) {
+                        String property = meta.attr("property");
+                        if (property.equals("og:image")) {
+                            img = meta.attr("content");
+                            continue;
                         }
-                        for (DataNode node : script.dataNodes()) {
-                            String urlImg = matchPattern(node.getWholeData(), IMAGE_PATTERN);
-                            if (urlImg != null) {
-                                String urlVid = matchPattern(node.getWholeData(), VIDEO_PATTERN);
-                                if (urlVid != null) {
-                                    urlVid = urlVid.replace(NOISE, "&");
-                                    final String finalUrl = urlVid;
-                                    activity.runOnUiThread(new Runnable() {
-                                        @Override
-                                        public void run() {
-                                            response.onResponse(new InstaPost(finalUrl, InstaPost.INSTA_VIDEO, url));
-                                        }
-                                    });
-                                    isData = true;
-                                    break;
-                                }
-                                urlImg = urlImg.replace(NOISE, "&");
-                                final String finalUrl = urlImg;
-                                activity.runOnUiThread(new Runnable() {
-                                    @Override
-                                    public void run() {
-                                        response.onResponse(new InstaPost(finalUrl, InstaPost.INSTA_IMAGE, url));
-                                    }
-                                });
-                                isData = true;
-                                break;
-                            }
+                        if (property.equals("og:video")) {
+                            vid = meta.attr("content");
+                            continue;
+                        }
+                        if (property.equals("og:type")) {
+                            type = meta.attr("content");
                         }
                     }
-                    if (!isData) {
+                    if (type == null || (!type.equals("video") && !type.equals("instapp:photo"))) {
                         activity.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
                                 response.onError(new NullPointerException("No data resource found"));
                             }
                         });
+                    } else {
+                        if (type.equals("instapp:photo")) {
+                            if (img != null) {
+                                final String finalImg = img;
+                                activity.runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        response.onResponse(new InstaPost(finalImg, InstaPost.INSTA_IMAGE, finalImg));
+                                    }
+                                });
+                            } else {
+                                activity.runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        response.onError(new NullPointerException("No data resource found"));
+                                    }
+                                });
+                            }
+                        } else {
+                            if (img != null && vid != null) {
+                                final String finalImg1 = img;
+                                final String finalVid = vid;
+                                activity.runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        response.onResponse(new InstaPost(finalVid, InstaPost.INSTA_VIDEO, finalImg1));
+                                    }
+                                });
+                            } else {
+                                activity.runOnUiThread(new Runnable() {
+                                    @Override
+                                    public void run() {
+                                        response.onError(new NullPointerException("No data resource found"));
+                                    }
+                                });
+                            }
+                        }
+
                     }
 
                 } catch (final IOException e) {
@@ -128,15 +140,6 @@ public void run() {
         }.start();
     }
 
-    private String matchPattern(String data, String patTxt) {
-        Pattern pattern = Pattern.compile(patTxt);
-        Matcher matcher = pattern.matcher(data);
-        boolean patMatch = matcher.find();
-        if (!patMatch) {
-            return null;
-        }
-        return matcher.group(1);
-    }
 
     /**
      * Retrieve the bitmap of the image post or thumbnail of video post
@@ -149,10 +152,7 @@ public void getBitmap(InstaPost post, final InstaImage instaImage) throws NullPo
         if (instaImage == null) {
             throw new NullPointerException("No InstaImage listener attached");
         }
-        String imgUrl = post.getUrl();
-        if (post.getType() == InstaPost.INSTA_VIDEO) {
-            imgUrl = matchPattern(post.getOriginalUrl(), POST_PATTERN) + "media?size=l";
-        }
+        String imgUrl = post.getThumbnailUrl();
         Glide.with(activity)
                 .asBitmap()
                 .load(imgUrl)
@@ -175,10 +175,7 @@ public void onLoadCleared(@Nullable Drawable placeholder) {
      * @param imageView To which view that image has to set
      */
     public void setImage(InstaPost post, ImageView imageView) {
-        String imgUrl = post.getUrl();
-        if (post.getType() == InstaPost.INSTA_VIDEO) {
-            imgUrl = matchPattern(post.getOriginalUrl(), POST_PATTERN) + "media?size=l";
-        }
+        String imgUrl = post.getThumbnailUrl();
         Glide.with(activity)
                 .load(imgUrl)
                 .into(imageView);

instautils/src/main/java/com/sanjaydevtech/instautils/InstaDownloader.java

@@ -6,14 +6,14 @@
 public class InstaPost {
     private String url;
     private int type;
-    private String originalUrl;
+    private String thumbnailUrl;
     public static final int INSTA_IMAGE = 0;
     public static final int INSTA_VIDEO = 1;
 
-    InstaPost(String url, int type, String originalUrl) {
+    InstaPost(String url, int type, String thumbnailUrl) {
         this.url = url;
         this.type = type;
-        this.originalUrl = originalUrl;
+        this.thumbnailUrl = thumbnailUrl;
     }
 
     /**
@@ -35,11 +35,11 @@ public int getType() {
     }
 
     /**
-     * get he original post url
+     * get the thumbnail
      *
-     * @return a String of post url
+     * @return a String
      */
-    public String getOriginalUrl() {
-        return originalUrl;
+    public String getThumbnailUrl() {
+        return thumbnailUrl;
     }
 }