From 335cdb8cb4266009c66e51bc4a433017a3ddd5e1 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Tue, 18 Aug 2020 20:25:05 +0200
Subject: [PATCH] Add createModelFromUrl for MVLive

---
 .../java/ctbrec/sites/manyvids/MVLive.java     | 18 ++++++++++++++++++
 .../manyvids/MVLiveMergedHlsDownload.java      |  8 --------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/ctbrec/sites/manyvids/MVLive.java b/common/src/main/java/ctbrec/sites/manyvids/MVLive.java
index 03a9c819..bf7b0cfc 100644
--- a/common/src/main/java/ctbrec/sites/manyvids/MVLive.java
+++ b/common/src/main/java/ctbrec/sites/manyvids/MVLive.java
@@ -6,6 +6,8 @@ import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -240,4 +242,20 @@ public class MVLive extends AbstractSite {
         }
         return result;
     }
+
+    @Override
+    public Model createModelFromUrl(String url) {
+        Matcher m = Pattern.compile("https://live.manyvids.com/stream/(.*?)(?:/.*?)?").matcher(url.trim());
+        if(m.matches()) {
+            return createModel(m.group(1));
+        }
+        m = Pattern.compile("https://www.manyvids.com/MVLive/(.*?)/\\d+/?").matcher(url.trim());
+        if(m.matches()) {
+            return createModel(m.group(1));
+        }
+
+        return super.createModelFromUrl(url);
+    }
+
+
 }
diff --git a/common/src/main/java/ctbrec/sites/manyvids/MVLiveMergedHlsDownload.java b/common/src/main/java/ctbrec/sites/manyvids/MVLiveMergedHlsDownload.java
index 26a4fc0d..6db9f879 100644
--- a/common/src/main/java/ctbrec/sites/manyvids/MVLiveMergedHlsDownload.java
+++ b/common/src/main/java/ctbrec/sites/manyvids/MVLiveMergedHlsDownload.java
@@ -32,14 +32,6 @@ public class MVLiveMergedHlsDownload extends MergedFfmpegHlsDownload {
                 return t;
             });
             scheduler.scheduleAtFixedRate(() -> updateCloudFlareCookies(), 2, 2, TimeUnit.MINUTES);
-
-            try {
-
-                ((MVLiveModel)getModel()).getRoomLocation();
-            } catch (IOException e) {
-                // TODO Auto-generated catch block
-                e.printStackTrace();
-            }
             updateCloudFlareCookies();
             super.start();
         } finally {