From 0f7e05a71da5518d5d23e0edda144b7b796e4540 Mon Sep 17 00:00:00 2001
From: Daniel M <danielm-github@dnml.de>
Date: Sun, 24 Jul 2022 15:39:00 +0200
Subject: [PATCH] Update zippyshare resolver 2022-07-24 + bump

- Bump version to 0.1.5
---
 Cargo.lock                |  2 +-
 Cargo.toml                |  2 +-
 src/integrations/zippy.rs | 65 +++++++++++++++++++++++++++++++++++----
 3 files changed, 61 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index be380ed..6d44cdc 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -183,7 +183,7 @@ dependencies = [
 
 [[package]]
 name = "ffdl"
-version = "0.1.4"
+version = "0.1.5"
 dependencies = [
  "anyhow",
  "chrono",
diff --git a/Cargo.toml b/Cargo.toml
index a5dfc04..be681a9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ffdl"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["daniel m <danielm@dnml.de>"]
 edition = "2021"
 description = "Download files fast"
diff --git a/src/integrations/zippy.rs b/src/integrations/zippy.rs
index 47eaf69..7ed3a87 100644
--- a/src/integrations/zippy.rs
+++ b/src/integrations/zippy.rs
@@ -23,8 +23,13 @@ pub async fn resolve_link(url: &str) -> Result<String> {
     let body = reqwest::get(url).await?.text().await?;
 
     // Try to extract the link using the latest extractor
-    let link = extract_dl_link_2022_07_17(&host, &body).await;
-    // Try the previous extractor as fallback if it didn't work
+    let link = extract_dl_link_2022_07_24(&host, &body).await;
+
+    // Try the previous extractors as fallback if it didn't work
+    let link = match link {
+        Err(_) => extract_dl_link_2022_07_17(&host, &body).await,
+        ok => ok,
+    };
     let link = match link {
         Err(_) => extract_dl_link_2022_03_07(&host, &body).await,
         ok => ok,
@@ -33,6 +38,56 @@ pub async fn resolve_link(url: &str) -> Result<String> {
     link
 }
 
+/*
+Updated: 24.07.2022
+Link generation code:
+
+```
+<span id="omg" class="2" style="display:none;"></span>
+<script type="text/javascript">
+    var a = function() {return 1};
+    var b = function() {return a() + 1};
+    var c = function() {return b() + 1};
+    var d = document.getElementById('omg').getAttribute('class');
+    if (true) { d = d*2;}
+    document.getElementById('dlbutton').href = "/d/gue47sk7/"+(34556%1000 + a() + b() + c() + d + 5/5)+"/some-file-name.part1.rar";
+```
+ */
+pub async fn extract_dl_link_2022_07_24(host: &str, body: &str) -> Result<String> {
+    let re_link = Regex::new(
+        r#"document\.getElementById\('dlbutton'\)\.href = "(/d/.+/)"\+\((\d+)%1000 \+ a\(\) \+ b\(\) \+ c\(\) \+ d \+ 5/5\)\+"(.+)";"#,
+    )?;
+
+    if !body.contains(r#"<span id="omg" class="2" style="display:none;"></span>"#) {
+        return Err(Error::new(ErrorKind::Other, "span part of the link-gen not found").into());
+    }
+
+    if !body.contains(
+        r#"var a = function() {return 1};
+    var b = function() {return a() + 1};
+    var c = function() {return b() + 1};
+    var d = document.getElementById('omg').getAttribute('class');
+    if (true) { d = d*2;}"#,
+    ) {
+        return Err(Error::new(ErrorKind::Other, "script part of the link-gen not found").into());
+    }
+
+    let cap_link = match re_link.captures(&body) {
+        Some(cap) => cap,
+        None => return Err(Error::new(ErrorKind::Other, "Link not found").into()),
+    };
+
+    let url_start = &cap_link[1];
+    let n1: u64 = cap_link[2].parse()?;
+    let url_end = &cap_link[3];
+
+    let middle = n1 % 1000 + 11;
+
+    let dl_url = format!("{}{}{}{}", &host, url_start, middle, url_end);
+
+    Ok(dl_url)
+}
+
 /*
 Updated: 17.07.2022
 Link generation code:
@@ -51,15 +106,13 @@ document.getElementById('dlbutton').href = "/d/0Ky7p1C6/"+(Math.pow(a, 3)+b)+"/s
 ```
  */
 pub async fn extract_dl_link_2022_07_17(host: &str, body: &str) -> Result<String> {
-    let re_var_a = Regex::new(
-        r#"var a = (\d+);"#
-    )?;
+    let re_var_a = Regex::new(r#"var a = (\d+);"#)?;
 
     // Regex to match the javascript part of the html that generates the real download link
     let re_link = Regex::new(
         r#"document\.getElementById\('dlbutton'\)\.href = "(/d/.+/)"\+\(Math\.pow\(a, 3\)\+b\)\+"(.+)";"#,
     )?;
-    
+
     let cap_var_a = match re_var_a.captures(&body) {
         Some(cap) => cap,
         None => return Err(Error::new(ErrorKind::Other, "Var a not found").into()),