Skip to content

Commit 0929ec5

Browse files
author
TECHTANIC
committed
.
1 parent 0bca96f commit 0929ec5

File tree

6 files changed

+41
-21
lines changed

6 files changed

+41
-21
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ GUI/pack/__pycache__/
22
CLI/__pycache__/
33
.vscode/
44
test/
5+
test.txt

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Changelog
22

3+
## v1.3
4+
- Added Save to txt file option in CLI and GUI
5+
- Fixed some logic
6+
7+
38
## v1.2
49
- Fixed RealDiscount and CourseVania
510

CLI/duce.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ def idcoupons():
190190

191191
# Constants
192192

193-
version = "v1.2"
193+
version = "v1.3"
194194

195195

196196
def create_scrape_obj():
@@ -238,7 +238,7 @@ def load_settings():
238238
settings["languages"]["Russian"]
239239
except KeyError:
240240
settings["languages"]["Russian"] = True
241-
241+
settings.setdefault("save_txt", True) #v1.3
242242
return settings, instructor_exclude, title_exclude
243243

244244

@@ -302,8 +302,8 @@ def course_landing_api(courseid):
302302

303303
instructor = (
304304
r["instructor_bio"]["data"]["instructors_info"][0]["absolute_url"]
305-
.lstrip("/user/")
306-
.rstrip("/")
305+
.removeprefix("/user/")
306+
.removesuffix("/")
307307
)
308308
try:
309309
purchased = r["purchase"]["data"]["purchase_date"]
@@ -318,9 +318,9 @@ def course_landing_api(courseid):
318318

319319

320320
def update_available():
321-
if version.lstrip("v") < requests.get(
321+
if version.removeprefix("v") < requests.get(
322322
"https://api.github.com/repos/techtanic/Discounted-Udemy-Course-Enroller/releases/latest"
323-
).json()["tag_name"].lstrip("v"):
323+
).json()["tag_name"].removeprefix("v"):
324324
print(by + fr + " Update Available ")
325325
else:
326326
return
@@ -434,9 +434,13 @@ def free_enroll(courseid):
434434
def auto(list_st):
435435

436436
se_c, ae_c, e_c, ex_c, as_c = 0, 0, 0, 0, 0
437-
for index, link in enumerate(list_st):
437+
if settings["save_txt"]:
438+
if not os.path.exists("Courses/"):
439+
os.makedirs("Courses/")
440+
txt_file = open(f"Courses/"+time.strftime("%Y-%m-%d--%H-%M"),"w")
441+
for index, combo in enumerate(list_st):
438442

439-
tl = link.split("|:|")
443+
tl = combo.split("|:|")
440444
print(fy + str(index) + " " + tl[0], end=" ")
441445
link = tl[1]
442446
print(fb + link)
@@ -479,7 +483,8 @@ def auto(list_st):
479483
print(fg + "Successfully Enrolled\n")
480484
se_c += 1
481485
as_c += amount
482-
486+
if settings["save_txt"]: txt_file.write(combo + "\n")
487+
483488
elif js["status"] == "failed":
484489
# print(js)
485490
print(fr + "Coupon Expired\n")
@@ -515,7 +520,7 @@ def auto(list_st):
515520
print(fg + "Successfully Subscribed\n")
516521
se_c += 1
517522
as_c += amount
518-
523+
if settings["save_txt"]: txt_file.write(combo + "\n")
519524
except:
520525
print(fr + "COUPON MIGHT HAVE EXPIRED\n")
521526
e_c += 1

COLAB/DUCE.ipynb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@
259259
"\n",
260260
"# Constants\n",
261261
"\n",
262-
"version = \"v1.2\"\n",
262+
"version = \"v1.3\"\n",
263263
"\n",
264264
"\n",
265265
"def create_scrape_obj():\n",
@@ -341,9 +341,9 @@
341341
"\n",
342342
"\n",
343343
"def update_available():\n",
344-
" if version.lstrip(\"v\") < requests.get(\n",
344+
" if version.removeprefix(\"v\") < requests.get(\n",
345345
" \"https://api.github.com/repos/techtanic/Discounted-Udemy-Course-Enroller/releases/latest\"\n",
346-
" ).json()[\"tag_name\"].lstrip(\"v\"):\n",
346+
" ).json()[\"tag_name\"].removeprefix(\"v\"):\n",
347347
" print(by + fr + \" Update Available \")\n",
348348
" else:\n",
349349
" return\n",

GUI/duce.py

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ def idcoupons():
213213

214214
########################### Constants
215215

216-
version = "v1.2"
216+
version = "v1.3"
217217

218218

219219
def create_scrape_obj():
@@ -264,7 +264,7 @@ def load_settings():
264264
settings["languages"]["Russian"]
265265
except KeyError:
266266
settings["languages"]["Russian"] = True
267-
267+
settings.setdefault("save_txt",True) #v1.3
268268
return settings, instructor_exclude, title_exclude
269269

270270

@@ -332,8 +332,8 @@ def course_landing_api(courseid):
332332

333333
instructor = (
334334
r["instructor_bio"]["data"]["instructors_info"][0]["absolute_url"]
335-
.lstrip("/user/")
336-
.rstrip("/")
335+
.removeprefix("/user/")
336+
.removesuffix("/")
337337
)
338338
try:
339339
purchased = r["purchase"]["data"]["purchase_date"]
@@ -362,7 +362,7 @@ def update_available():
362362
release_version = requests.get(
363363
"https://api.github.com/repos/techtanic/Discounted-Udemy-Course-Enroller/releases/latest"
364364
).json()["tag_name"]
365-
if version.lstrip("v") < release_version.lstrip("v"):
365+
if version.removeprefix("v") < release_version.removeprefix("v"):
366366
return (
367367
f" Update {release_version} Availabe",
368368
f"Update {release_version} Availabe",
@@ -487,9 +487,13 @@ def free_enroll(courseid):
487487
def auto(list_st):
488488
main_window["pout"].update(0, max=len(list_st))
489489
se_c, ae_c, e_c, ex_c, as_c = 0, 0, 0, 0, 0
490-
for index, link in enumerate(list_st):
490+
if settings["save_txt"]:
491+
if not os.path.exists("Courses/"):
492+
os.makedirs("Courses/")
493+
txt_file = open(f"Courses/"+time.strftime("%Y-%m-%d--%H-%M"),"w")
494+
for index, combo in enumerate(list_st):
491495

492-
tl = link.split("|:|")
496+
tl = combo.split("|:|")
493497
main_window["out"].print(str(index) + " " + tl[0], text_color="yellow", end=" ")
494498
link = tl[1]
495499
main_window["out"].print(link, text_color="blue")
@@ -543,6 +547,7 @@ def auto(list_st):
543547
main_window["out"].print()
544548
se_c += 1
545549
as_c += amount
550+
if settings["save_txt"]: txt_file.write(combo + "\n")
546551
elif js["status"] == "failed":
547552
# print(js)
548553
main_window["out"].print(
@@ -590,6 +595,8 @@ def auto(list_st):
590595
main_window["out"].print()
591596
se_c += 1
592597
as_c += amount
598+
599+
if settings["save_txt"]: txt_file.write(combo + "\n")
593600

594601
except:
595602
main_window["out"].print(
@@ -1001,6 +1008,7 @@ def main1():
10011008
font=25,
10021009
)
10031010
],
1011+
[sg.Checkbox("Save enrolled courses in txt", key="save_txt", default=settings["save_txt"])]
10041012
]
10051013

10061014

duce-gui-settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,5 +50,6 @@
5050
"IDownloadCoupons": true
5151
},
5252
"email": "",
53-
"password": ""
53+
"password": "",
54+
"save_txt": true
5455
}

0 commit comments

Comments
 (0)