From a91b8178d84fba6c9412cf0465730c052fbd5d8f Mon Sep 17 00:00:00 2001 From: Jules-WinnfieldX Date: Thu, 24 Mar 2022 21:16:36 -0600 Subject: [PATCH] Remove update checker logic from main.py (it was checking release numbers from the releases github page, which is being depricated). Update readme.md for binary release, and increment version number. --- README.md | 20 +++++++++++++------- URLs.txt | 0 cyberdrop_dl/__init__.py | 2 +- cyberdrop_dl/main.py | 15 ++------------- 4 files changed, 16 insertions(+), 21 deletions(-) delete mode 100644 URLs.txt diff --git a/README.md b/README.md index 76eea6c30..0b00232b1 100644 --- a/README.md +++ b/README.md @@ -11,8 +11,8 @@ | Pixl | Albums: pixl.is/album/...
Direct Images: pixl.is/image/...
User Profile: pixl.is/#USER#
All User Albums: pixl.is/#USER#/albums | | Bunkr | Albums: bunkr.is/a/...
Direct Videos: stream.bunkr.is/v/...
Direct Videos: cdn.bunkr.is/...
Direct Images: i.bunkr.is/...
Also works with Bunkr.to | | GoFile | Albums: gofile.io/d/... | -| Erome | Albums: erome.com/a/... -| PixelDrain | Albums: Pixeldrain.com/l/...
Single Files: Pixeldrain.com/u/... +| Erome | Albums: erome.com/a/... | +| PixelDrain | Albums: Pixeldrain.com/l/...
Single Files: Pixeldrain.com/u/... | # Information @@ -24,16 +24,22 @@ You can get Python from here: https://www.python.org/downloads/ It'll repeat that for every link you give it. # Installation + +## Manually +Go to the [releases page](https://github.com/Jules-WinnfieldX/CyberDropDownloader/releases) and download the Cyberdrop_DL.zip file. Extract it to wherever you want the program to be. ## Using `pip` Once Python is installed, run `pip3 install --user cyberdrop-dl`. Advanced users may want to use virtual environments (via `pipx`), but it's **NOT** required. -## Manually -_Coming soon..._ - # Usage -## Simple way + +## Manual way (Manual install above) +Put the links in the URLs.txt file then run Start.bat (Windows) or start.sh (OS X**/Linux**) file. + +** Mac and Linux will need to run the command `chmod +x start.sh` to make the file executable. + +## Simple (Pip install above) 1. Run `cyberdrop-dl` once to generate an empty `URLs.txt` file. 2. Copy and paste your links into `URLs.txt`. Each link you add has to go on its own line (paste link, press enter, repeat). @@ -41,7 +47,7 @@ Each link you add has to go on its own line (paste link, press enter, repeat). It will begin to download everything. 4. Enjoy! -## Custom way +## Custom way (Pip install above) If you know what you're doing, you can use some of the available options to adjust how the program runs. ``` $ cyberdrop-dl -h diff --git a/URLs.txt b/URLs.txt deleted file mode 100644 index e69de29bb..000000000 diff --git a/cyberdrop_dl/__init__.py b/cyberdrop_dl/__init__.py index 2614ce9d9..7a38ae062 100644 --- a/cyberdrop_dl/__init__.py +++ b/cyberdrop_dl/__init__.py @@ -1 +1 @@ -__version__ = "2.7.0" +__version__ = "2.7.1" diff --git a/cyberdrop_dl/main.py b/cyberdrop_dl/main.py index 8583ea14c..1042246bf 100644 --- a/cyberdrop_dl/main.py +++ b/cyberdrop_dl/main.py @@ -20,6 +20,7 @@ except Exception: pass + def parse_args(): parser = argparse.ArgumentParser(description="Bulk downloader for multiple file hosts") parser.add_argument("-V", "--version", action="version", version="%(prog)s " + VERSION) @@ -44,18 +45,6 @@ def clear() -> None: os.system('cls' if os.name == 'nt' else 'clear') -def version_check() -> None: - response = requests.get("https://api.github.com/repos/Jules-WinnfieldX/CyberDropDownloader/releases/latest") - latest_version = response.json()["tag_name"] - logging.debug(f"We are running version {VERSION} of Cyberdrop Downloader") - if latest_version != VERSION: - log("A new version of CyberDropDownloader is available\n" - "Download it here: https://github.com/Jules-WinnfieldX/CyberDropDownloader/releases/latest\n", Fore.RED) - if input("Keep going? (Y/n) ") == "n": - exit() - clear() - - def regex_links(urls) -> list: all_links = [x.group().replace(".md.", ".") for x in re.finditer(r"(?:http.*?)(?=('|$|\n|\r\n|\r|\s)|\")", urls)] return all_links @@ -64,7 +53,7 @@ def regex_links(urls) -> list: async def download_all(args: argparse.Namespace): nest_asyncio.apply() clear() - version_check() + log(f"We are running version {VERSION} of Cyberdrop Downloader", Fore.WHITE) logging.debug(f"Starting downloader with args: {args.__dict__}") input_file = Path(args.input_file) if not os.path.isfile(input_file):