From fa80cbf50421789b3c178d5763dacf9acc863600 Mon Sep 17 00:00:00 2001 From: FieryEagle Date: Sat, 8 Mar 2025 17:59:55 +0000 Subject: [PATCH] changed to copyparty --- DiscordBot.py | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/DiscordBot.py b/DiscordBot.py index 39d873c..edaba00 100644 --- a/DiscordBot.py +++ b/DiscordBot.py @@ -8,7 +8,7 @@ import logging ########################################## #Logging -loglevel = logging.INFO +loglevel = logging.DEBUG logger = logging.getLogger('Uploadbot') logger.setLevel(loglevel) #Console Handler @@ -61,14 +61,21 @@ def dayuploads_get(url: str): file.write(torrent_file.content) def uploadfile(file_name: str): - with open(file_name, "rb") as file: - response = requests.put(f"https://upload.fieryeagle.org/remote.php/dav/files/admin/torfiles/{file_name}", - file, auth=("admin", "tcbAY-WgBb7-zYm25-QftPn-zKBpR")) + with open(file_name, "rb") as torrent_file: + response = requests.put(f"https://upload.fieryeagle.org/torfiles/{file_name}", + torrent_file, auth=("admin","TVcZRYhT5Cd#@eY8P9NxNN2mC")) try: assert response.status_code in range(200, 300) except AssertionError: logging.error(f'Error uploading file {file_name}. Status code:', response.status_code) # noqa: E501 - + +# with open(file_name, "rb") as file: +# response = requests.put(f"https://cloud.woelkli.com/remote.php/dav/files/ddseed%40tutanota.com/torfiles/{file_name}", +# file, auth=("ddseed@tutanota.com", "hsPBH0S60&DQB6dD.2")) +# try: +# assert response.status_code in range(200, 300) +# except AssertionError: +# logging.error(f'Error uploading file {file_name}. Status code:', response.status_code) # noqa: E501 def regex(inp: str) -> str: if "pixeldrain.com" in inp.lower(): @@ -126,12 +133,17 @@ async def on_message(message): regex(i) files = files_to_upload('.') for i in files: - uploadfile(i) - await messagechannel.send(f"{i[:-8]}\nhttps://torfiles.fieryeagle.org/{urlencode(i)}") - os.remove(i) - logger.info(f"Files to upload are {files}") + try: + uploadfile(i) + except AssertationError: + logger.error("Upload failed, quitting...") + return + else: + await messagechannel.send(f"{i[:-8]}\nhttps://torfiles.fieryeagle.org/{urlencode(i)}") +# await messagechannel.send(f"{i[:-8]}\nhttps://torfiles.ddseed.cf/{urlencode(i)}") + os.remove(i) # noqa: E501 - logger.info(f"Posted link for {i}") + logger.info(f"Posted link for {i}") return bot.run(TOKEN)