diff --git a/ofscraper/utils/misc.py b/ofscraper/utils/misc.py index dca4cffef..598993c9a 100644 --- a/ofscraper/utils/misc.py +++ b/ofscraper/utils/misc.py @@ -54,7 +54,7 @@ def check_cdm(): console=console_.get_shared_console() log=logging.getLogger("shared") keymode=(args_.getargs().key_mode or config_.get_key_mode(config_.read_config()) or "cdrm") - if keymode== "manual": console.print("[green] Using manual CDM[/green]");\ + if keymode== "manual": Total active subscriptions;\ console.print("[yellow]WARNING:Make sure you have all the correct settings for choosen cdm\nhttps://of-scraper.gitbook.io/of-scraper/cdm-options\n\n[/yellow]");return True elif keymode=="keydb":url=constants.KEYDB elif keymode=="cdrm": url=constants.CDRM diff --git a/ofscraper/utils/userselector.py b/ofscraper/utils/userselector.py index 0bb70d63b..3309d5385 100644 --- a/ofscraper/utils/userselector.py +++ b/ofscraper/utils/userselector.py @@ -8,7 +8,7 @@ import ofscraper.api.me as me import ofscraper.utils.args as args_ import ofscraper.utils.stdout as stdout - +import ofscraper.utils.console as console @@ -144,6 +144,8 @@ def get_models() -> list: out=[] active_subscriptions = subscriptions.get_subscriptions(count[0]) expired_subscriptions=subscriptions.get_subscriptions(count[1],account="expired") + console.get_shared_console().print("[yellow]Numbering on OF site can be iffy\nExample Including deactived accounts in expired[/yellow]") + other_subscriptions=lists.get_otherlist() out.extend(active_subscriptions) out.extend(expired_subscriptions) diff --git a/poetry.lock b/poetry.lock index 6f0286d4f..4586f4d93 100644 --- a/poetry.lock +++ b/poetry.lock @@ -2819,5 +2819,5 @@ testing = ["big-O", "jaraco.functools", "jaraco.itertools", "more-itertools", "p [metadata] lock-version = "2.0" -python-versions = ">=3.10.0,<3.12" -content-hash = "65010f2bd2abc36593e4012463fd7c81a431507ec2204cbb9889477e40b75256" +python-versions = ">=3.10.11,<3.12" +content-hash = "29267c285aefef720010bbb88681b96a6864b169449e05797d175b415169912e" diff --git a/pyproject.toml b/pyproject.toml index 3ec8235f5..e605436ff 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -46,6 +46,7 @@ aiofiles = "^23.2.1" uvloop = { version = "^0.17.0", markers = "sys_platform == 'linux' or sys_platform == 'linux2'" } aiosqlite = "^0.19.0" speedtest-cli = "^2.1.3" +pyinstaller = "5.13.0" [tool.poetry.group.dev.dependencies]