Fixed Few issues added russian

TECHTANIC · TECHTANIC · commit d6aa74566f6e · 2021-06-17T19:01:15.000+03:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## v1.1
+- Fixed ReadDiscount and CourseVania
+- Added Russian Language filter
+
 ## v1.0
 
 - Fresh start
diff --git a/CLI/duce.py b/CLI/duce.py
@@ -124,11 +124,8 @@ def real_discount():
         r = requests.get(url)
         soup = bs(r.content, "html5lib")
         try:
-            link = soup.select_one(
-                "#panel > div:nth-child(4) > div:nth-child(1) > div.col-lg-7.col-md-12.col-sm-12.col-xs-12 > a"
-            )["href"]
-            if link.startswith("https://www.udemy.com"):
-                rd_links.append(title + "|:|" + link)
+            link = soup.select_one("a[href^='https://www.udemy.com']")["href"]
+            rd_links.append(title + "|:|" + link)
         except:
             pass
     rd_bar.close()
@@ -140,7 +137,7 @@ def coursevania():
     cv_links = []
     r = requests.get("https://coursevania.com/courses/")
     soup = bs(r.content, "html5lib")
-    nonce = soup.find_all("script")[22].text[30:]
+    nonce = soup.find_all("script")[20].text[30:]
     nonce = json.loads(nonce[: len(nonce) - 6])["load_content"]
     r = requests.get(
         "https://coursevania.com/wp-admin/admin-ajax.php?&template=courses/grid&args={%22posts_per_page%22:%2230%22}&action=stm_lms_load_content&nonce="
@@ -193,7 +190,7 @@ def idcoupons():
 
 # Constants
 
-version = "v1.0"
+version = "v1.1"
 
 
 def create_scrape_obj():
@@ -224,12 +221,6 @@ def cookiejar(
     return cookies
 
 
-def save_settings(settings):
-    if True:
-        with open("duce-cli-settings.json", "w") as f:
-            json.dump(settings, f, indent=4)
-
-
 def load_settings():
     try:
         with open("duce-cli-settings.json") as f:
@@ -240,22 +231,22 @@ def load_settings():
             "https://raw.githubusercontent.com/techtanic/Discounted-Udemy-Course-Enroller/master/duce-cli-settings.json"
         ).json()
 
-    try:  # v1.2
-        del settings["access_token"]
-        del settings["client_id"]
-        settings["email"] = ""
-        settings["password"] = ""
-    except:
-        pass
-
-    instructor_exclude = "\n".join(settings["instructor_exclude"])
     title_exclude = "\n".join(settings["title_exclude"])
+    instructor_exclude = "\n".join(settings["instructor_exclude"])
 
-    save_settings(settings)
+    try:
+        settings["languages"]["Russian"]
+    except KeyError:
+        settings["languages"]["Russian"] = True
 
     return settings, instructor_exclude, title_exclude
 
 
+def save_settings():
+    with open("duce-cli-settings.json", "w") as f:
+        json.dump(settings, f, indent=4)
+
+
 def get_course_id(url):
     r = requests.get(url, allow_redirects=False)
     if r.status_code in (404, 302, 301):
@@ -392,7 +383,7 @@ def check_login(email, password):
     currency = r["Config"]["price_country"]["currency"]
     user = r["me"]["display_name"]
     settings["email"], settings["password"] = email, password
-    save_settings(settings)
+    save_settings()
     return head, user, currency, s, ""
 
 
diff --git a/COLAB/DUCE.ipynb b/COLAB/DUCE.ipynb
@@ -193,11 +193,8 @@
         "        r = requests.get(url)\n",
         "        soup = bs(r.content, \"html5lib\")\n",
         "        try:\n",
-        "            link = soup.select_one(\n",
-        "                \"#panel > div:nth-child(4) > div:nth-child(1) > div.col-lg-7.col-md-12.col-sm-12.col-xs-12 > a\"\n",
-        "            )[\"href\"]\n",
-        "            if link.startswith(\"https://www.udemy.com\"):\n",
-        "                rd_links.append(title + \"|:|\" + link)\n",
+        "            link = soup.select_one(\"a[href^='https://www.udemy.com']\")[\"href\"]\n",
+        "            rd_links.append(title + \"|:|\" + link)\n",
         "        except:\n",
         "            pass\n",
         "    rd_bar.close()\n",
@@ -209,7 +206,7 @@
         "    cv_links = []\n",
         "    r = requests.get(\"https://coursevania.com/courses/\")\n",
         "    soup = bs(r.content, \"html5lib\")\n",
-        "    nonce = soup.find_all(\"script\")[22].text[30:]\n",
+        "    nonce = soup.find_all(\"script\")[20].text[30:]\n",
         "    nonce = json.loads(nonce[: len(nonce) - 6])[\"load_content\"]\n",
         "    r = requests.get(\n",
         "        \"https://coursevania.com/wp-admin/admin-ajax.php?&template=courses/grid&args={%22posts_per_page%22:%2230%22}&action=stm_lms_load_content&nonce=\"\n",
@@ -262,7 +259,7 @@
         "\n",
         "# Constants\n",
         "\n",
-        "version = \"v1.0\"\n",
+        "version = \"v1.1\"\n",
         "\n",
         "\n",
         "def create_scrape_obj():\n",
diff --git a/GUI/duce.py b/GUI/duce.py
@@ -144,14 +144,10 @@ def real_discount():
         r = requests.get(url)
         soup = bs(r.content, "html5lib")
         try:
-            link = soup.select_one(
-                "#panel > div:nth-child(4) > div:nth-child(1) > div.col-lg-7.col-md-12.col-sm-12.col-xs-12 > a"
-            )["href"]
-            if link.startswith("https://www.udemy.com"):
-                rd_links.append(title + "|:|" + link)
+            link = soup.select_one("a[href^='https://www.udemy.com']")["href"]
+            rd_links.append(title + "|:|" + link)
         except:
             pass
-
     main_window["pReal Discount"].update(0, visible=False)
     main_window["iReal Discount"].update(visible=True)
 
@@ -162,7 +158,7 @@ def coursevania():
     cv_links = []
     r = requests.get("https://coursevania.com/courses/")
     soup = bs(r.content, "html5lib")
-    nonce = soup.find_all("script")[22].text[30:]
+    nonce = soup.find_all("script")[20].text[30:]
     nonce = json.loads(nonce[: len(nonce) - 6])["load_content"]
     r = requests.get(
         "https://coursevania.com/wp-admin/admin-ajax.php?&template=courses/grid&args={%22posts_per_page%22:%2230%22}&action=stm_lms_load_content&nonce="
@@ -217,7 +213,7 @@ def idcoupons():
 
 ########################### Constants
 
-version = "v1.0"
+version = "v1.1"
 
 
 def create_scrape_obj():
@@ -246,12 +242,6 @@ def cookiejar(
     return cookies
 
 
-def save_settings(settings):
-    if True:
-        with open("duce-gui-settings.json", "w") as f:
-            json.dump(settings, f, indent=4)
-
-
 def load_settings():
     try:
         os.rename("duce-settings.json", "duce-gui-settings.json")
@@ -261,30 +251,28 @@ def load_settings():
         with open("duce-gui-settings.json") as f:
             settings = json.load(f)
     except FileNotFoundError:
-        settings = requests.get(
-            "https://raw.githubusercontent.com/techtanic/Discounted-Udemy-Course-Enroller/master/duce-gui-settings.json"
-        ).json()
+        settings = dict(
+            requests.get(
+                "https://raw.githubusercontent.com/techtanic/Discounted-Udemy-Course-Enroller/master/duce-gui-settings.json"
+            ).json()
+        )
 
     title_exclude = "\n".join(settings["title_exclude"])
     instructor_exclude = "\n".join(settings["instructor_exclude"])
 
-    try:  # v4.3
-        del settings["access_token"]
-        del settings["client_id"]
-        settings["email"] = ""
-        settings["password"] = ""
-    except:
-        pass
-    try:  # v4.3
-        settings["stay_logged_in"]["cookie"]
-        del settings["stay_logged_in"]["cookie"]
-        settings["stay_logged_in"]["manual"] = False
-    except:
-        pass
-    save_settings(settings)
+    try:
+        settings["languages"]["Russian"]
+    except KeyError:
+        settings["languages"]["Russian"] = True
+
     return settings, instructor_exclude, title_exclude
 
 
+def save_settings():
+    with open("duce-gui-settings.json", "w") as f:
+        json.dump(settings, f, indent=4)
+
+
 def fetch_cookies():
     cookies = browser_cookie3.load(domain_name="www.udemy.com")
     return requests.utils.dict_from_cookiejar(cookies), cookies
@@ -775,7 +763,7 @@ def main1():
                         my_cookies["csrftoken"],
                     )
                     settings["stay_logged_in"]["auto"] = values["sli_a"]
-                    save_settings(settings)
+                    save_settings()
                     login_window.close()
                     break
 
@@ -822,7 +810,7 @@ def main1():
                         client_id, access_token, csrf_token
                     )
                     settings["stay_logged_in"]["manual"] = values["sli_m"]
-                    save_settings(settings)
+                    save_settings()
                     login_window.close()
                     break
                 else:
@@ -1138,7 +1126,7 @@ def main1():
             False,
             False,
         )
-        save_settings(settings)
+        save_settings()
         break
 
     elif event == "Support":
@@ -1163,7 +1151,7 @@ def main1():
             filter(None, values["title_exclude"].split("\n"))
         )
         settings["min_rating"] = float(values["min_rating"])
-        save_settings(settings)
+        save_settings()
 
         all_functions = create_scrape_obj()
         funcs = {}
diff --git a/duce-cli-settings.json b/duce-cli-settings.json
@@ -31,7 +31,8 @@
         "Spanish": true,
         "Thai": true,
         "Turkish": true,
-        "Hindi": true
+        "Hindi": true,
+        "Russian": true
     },
     "sites": {
         "Discudemy": true,
diff --git a/duce-gui-settings.json b/duce-gui-settings.json
@@ -23,7 +23,8 @@
         "Romanian": true,
         "Spanish": true,
         "Thai": true,
-        "Turkish": true
+        "Turkish": true,
+        "Russian": true
     },
     "categories": {
         "Business": true,
