Skip to content

Commit

Permalink
complete 1.5.2
Browse files Browse the repository at this point in the history
fix #41
fix #35
fix #40
fix: green text on config generation working again
bump: requests 2.31.0 -> 2.32.0
bump: urllib3 2.0.7 -> 2.2.2
  • Loading branch information
Official-Husko committed Jul 1, 2024
2 parents fd56a0e + cde5428 commit 617f4f7
Show file tree
Hide file tree
Showing 44 changed files with 81 additions and 2,296 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/build_windows.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Build Windows Executable

on:
push:
branches:
- development
- oop-rewrite

jobs:
build:
runs-on: windows-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v5
with:
python-version: 3.12.4 # Specify the Python version you need

- name: Create virtual environment and build
shell: bash
run: |
python -m venv .env
source .env/Scripts/activate
python -m pip install --upgrade pip
pip install pyinstaller
pip install -r requirements.txt # Replace with your requirements file if exists
pyinstaller --paths .env/Lib/site-packages \
--hidden-import plyer.platforms.win.filechooser \
--add-data=".env/Lib/site-packages/grapheme/data/*;grapheme/data/" \
--onefile \
--icon "icon.ico" \
--console \
--name "Mul-Tor" \
main.py
- name: Upload artifact
uses: actions/upload-artifact@v4
with:
name: mul-tor-windows
path: dist/Mul-Tor.exe # Adjust the path to your executable relative to the root of the repository
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ possible_sites.txt
preset_sorter.py
preset_sorter.json
very_big_game.7z
.DEBUG
test_files/test.png
/.vscode/*
16 changes: 0 additions & 16 deletions .vscode/launch.json

This file was deleted.

1 change: 0 additions & 1 deletion Build Releases.bat

This file was deleted.

12 changes: 3 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
Site | API | API Key Required | Max File Size
--- | --- | --- | ---
[Gofile][7] | [Yes][8] | No | ∞
[Pixeldrain][1] | [Yes][2] | No | 20 GB
[Pixeldrain][1] | [Yes][2] | [Yes][5] | 20 GB
[BowFile][17] | [Yes][18] | [Yes][19] | 5 GB
[Doodrive][36] | [Yes][37] | [Yes][38] | 5 GB
[Download.gg][102] | No | No | 25 GB
Expand All @@ -48,7 +48,7 @@ Site | API | API Key Required | Max File Size
[Files.dp.ua][108] | No | No | 100 GB
[Files.fm][45] | No | No | 5 GB
[Krakenfiles][124] | No | No | 1 GB
[Transfer_sh.sh][98] | No | No | ∞
[Transfer.sh][98] | No | No | ∞
[/tmp/files][117] | [Yes][118] | No | 100 MB
[Mixdrop][29] | [Yes][30] | [Yes][30] | ∞
[1Fichier][31] | [Yes][32] | No | 300 GB
Expand Down Expand Up @@ -77,13 +77,6 @@ Site | API | API Key Required | Max File Size

<br />

### Planned Sites:
Site | API | API Key Required | Max File Size
--- | --- | --- | ---
None Currently :)

<br />

### Rejected Sites:
<details>

Expand Down Expand Up @@ -177,6 +170,7 @@ None Currently :)
[2]: https://pixeldrain.com/api
[3]: https://github.com/Official-Husko/mul-tor#rejected-sites
[4]: https://github.com/Official-Husko/mul-tor/issues
[5]: https://pixeldrain.com/user/api_keys
[7]: https://gofile.io/
[8]: https://gofile.io/api
[9]: https://oshi.at/
Expand Down
1 change: 0 additions & 1 deletion enable_env.bat

This file was deleted.

13 changes: 9 additions & 4 deletions main.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@

###
# Things in this part are meant for debugging and toggling certaint things.
use_test_file = False
use_test_file = True
test_small_file = True
test_large_file = False
test_very_large_file = False
SKIP_SITE_CHECK = True
#
###

version = "1.5.1"
version = "1.5.2"
owd = os.getcwd()
platform = sys.platform

Expand Down Expand Up @@ -127,9 +128,13 @@ def selection(config, available, user_agents_list, proxy_list=""):

if DEBUG == True and use_test_file == True:
if test_small_file == True:
files_list = [f"{owd}\\test.png"]
files_list = [f"{os.path.join(owd, 'test.png')}"]
elif test_large_file == True:
files_list = [f"{os.path.join(owd, 'big_game.7z')}"]
elif test_very_large_file == True:
files_list = [f"{os.path.join(owd, 'very_big_game.7z')}"]
else:
files_list = [f"{owd}\\big_game.zip"]
print(colored("Something fucked up! Please report this on github. Test_File_Error", "red"))

else:
amount_question = [
Expand Down
2 changes: 1 addition & 1 deletion modules/auto_update.py
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ def Checker():
if os.path.exists("delete-exe.bat"):
os.remove("delete-exe.bat")
with open("delete-exe.bat", "a") as bat_creator:
bat_content = f'TASKKILL -F /IM Mul-Tor.exe\ntimeout 3\nDEL .\\Mul-Tor.exe\nren .\\mul-tor-{repo_version}.exe Mul-Tor.exe.exe\nDEL .\\delete-exe.bat'
bat_content = f'TASKKILL -F /IM Mul-Tor.exe\ntimeout 3\nDEL .\\Mul-Tor.exe\nren .\\mul-tor-{repo_version}.exe Mul-Tor.exe\nDEL .\\delete-exe.bat'
bat_creator.write(bat_content)
bat_creator.close()
os.startfile(r".\\delete-exe.bat")
Expand Down
4 changes: 2 additions & 2 deletions modules/buzzheavier.py
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def Uploader(file, proxy_list, user_agents, api_keys):

# Send the upload request with the form data, headers, and proxies
with open(file, "rb") as file_upload:
raw_req = requests.put(url=f"{upload_url}{file_name}?expiry=10368000", data=file_upload, headers=headers, proxies=proxies, timeout=300, stream=True)
raw_req = requests.put(url=f"{upload_url}{file_name}", data=file_upload, headers=headers, proxies=proxies, timeout=300, stream=True)
file_upload.close()
if raw_req.status_code == 201:

Expand All @@ -63,4 +63,4 @@ def Uploader(file, proxy_list, user_agents, api_keys):

except Exception as e:
# Return error message
return {"status": "error", "file_name": file_name, "exception": str(e), "extra": raw_req}
return {"status": "error", "file_name": file_name, "exception": str(e), "extra": raw_req}
9 changes: 4 additions & 5 deletions modules/config_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from .pretty_print import *
from .logger import Logger

current_config_version = "1.4.0"
current_config_version = "1.5.0"

class Config_Manager:

Expand Down Expand Up @@ -66,16 +66,15 @@ def Writer():
"email": "",
"password": ""
},
"FileStore": {
"username": "",
"password": ""
"Pixeldrain": {
"apiKey": "",
}
},
"blacklist": ["SomeSiteName", "CheapGoFileCopy", "HotSinglesInYourArea"]
}
with open("config.json", "w") as cfg_file:
json.dump(template, cfg_file, indent=6)
print(colored(f"{info} New config file generated! Configure it and restart the program or wait 5 seconds and the program will continue with the default values."), "green")
print(f'{info} {colored("New config file generated! Configure it and restart the program or wait 5 seconds and the program will continue with the default values.", "green")}')
print("")
sleep(5)
return template
Expand Down
6 changes: 0 additions & 6 deletions modules/deprecated/README.md

This file was deleted.

55 changes: 0 additions & 55 deletions modules/deprecated/anonfiles.py

This file was deleted.

64 changes: 0 additions & 64 deletions modules/deprecated/anonfilesme.py

This file was deleted.

Loading

0 comments on commit 617f4f7

Please sign in to comment.