Discord Notifications #21

Pukabyte · 2024-07-14T14:11:51Z

Added RTN to blackhole.py for parsing torrent names
Dockerfile.blackhole needs to be changed to at least Python 3.11-slim
rank-torrent-name added to requirements.txt
Edited discord.py to handle new updates
A couple of edits in debrid.py
Added better rate limiting in blackhole.py
This can now parse whether it's processing a Series or Movie

* Add Lidarr Support to blackhole.py Attempt #1 - Adds Lidarr Support * Add Lidarr Variables .env.template * Lidarr Support for arr.py

had errors starting the repair script. change bencode3 to `#all` to fix

Handles file not found errors by telling the arrs to refresh and rescan the item.

SPELLING

requirements.txt

westsurname · 2024-07-15T22:14:44Z

blackhole.py

@@ -83,26 +83,28 @@ def cleanFileName(name):

 refreshingTask = None

-async def refreshArr(arr: Arr, count=60):


Why get rid of this system rather than updating it? This was here so that if you refreshArr on multiple torrents at the same time it doesn't just pile them up but does them all in the same refresh option.

This actually might be broken in that it doesn't take into account which arr we're dealing with, but that can probably be fixed pretty easily.

westsurname · 2024-07-15T22:15:36Z

blackhole.py

+        arr.refreshMonitoredDownloads()
+        await asyncio.sleep(delay)
+
+def retryRequest(func, retries=3, delay=2, print=print):


We already have a retryRequest system, let's update that and use it here instead?

westsurname · 2024-07-15T22:16:58Z

blackhole.py


 def copyFiles(file: TorrentFileInfo, folderPathMountTorrent, arr: Arr):
-    # Consider removing this and always streaming


We should probably get rid of this whole chunk of code rather than the comment.

westsurname · 2024-07-15T22:23:42Z

blackhole.py

            if not await torrent.selectFiles():
                torrent.delete()
                return False
-        elif status == torrent.STATUS_DOWNLOADING:
+            await asyncio.sleep(15)  # Add a 15-second wait between select file calls


westsurname · 2024-07-15T22:25:58Z

blackhole.py

@@ -188,14 +218,6 @@ def print(*values: object):
                    for root, dirs, files in os.walk(folderPathMountTorrent):
                        relRoot = os.path.relpath(root, folderPathMountTorrent)
                        for filename in files:
-                            # Check if the file is accessible
-                            # if not await is_accessible(os.path.join(root, filename)):


If getting rid of this we should probably get rid of the code it's calling. Alternatively we can try getting the is_accessible code to work.

westsurname · 2024-07-15T22:56:08Z

shared/debrid.py

@@ -254,20 +261,16 @@ async def selectFiles(self):
                extraFilesGroup = next((fileGroup for fileGroup in self._instantAvailability if largestMediaFileId in fileGroup.keys()), None)
                if self.onlyLargestFile and extraFilesGroup:
                    self.print('extra files required for cache:', extraFilesGroup)
-                    discordUpdate('Extra files required for cache:', extraFilesGroup)


I'd like to keep this as a separate message because I'm still trying to gauge how often it happens. I don't know of anyone that's actually gotten this message yet.

westsurname · 2024-07-15T22:57:12Z

shared/debrid.py

-        if self.onlyLargestFile and len(mediaFiles) > 1:
-            discordUpdate('largest file:', largestMediaFile['path'])


This is a debugging tool, should we add it as a field in the discord message?

westsurname · 2024-07-15T23:01:09Z

shared/debrid.py

+    @property
+    def instantAvailability(self):
+        return self._instantAvailability
+


Is there a purpose for this and the one in torbox?

westsurname · 2024-07-15T23:02:00Z

shared/debrid.py

@@ -412,7 +423,7 @@ async def getInfo(self, refresh=False):
                torrents = infoRequest.json()['data']

                for torrent in torrents:
-                    if torrent['id'] == self.id:
+                    if (torrent['id'] == self.id) and ('download_finished' in torrent):


I think we specifically don't want this.

westsurname · 2024-07-15T23:03:44Z

shared/discord.py

+        rate_limit_retry=True, 
+        username='Update Bot'
+    )
+    webhook.add_embed(embed)


Any need to move this out here instead of inline?

westsurname · 2024-07-15T23:07:48Z

.env.template

+TAG_ON_SUCCESS=true
+TAG_ON_FAILURE=false


Start these with DISCORD

westsurname · 2024-07-15T23:09:20Z

.env.template

+DISCORD_USER_TAG=<your_discord_user_id>
+TAG_ON_SUCCESS=true
+TAG_ON_FAILURE=false


Consider making these a blackhole property instead of a discord property. Though not really sure where they belong because they currently only apply to blackhole, but should it remain that way?

Hmm it would be cool to have repair added to the discord notifications if we are wanting to do the one big embed?

westsurname · 2024-07-15T23:11:04Z

.env.template

+DISCORD_USER_TAG=<your_discord_user_id>
+TAG_ON_SUCCESS=true
+TAG_ON_FAILURE=false


Update all the locations that this is applicable, like the readme file. (I usually just ask gpt for a description)

westsurname · 2024-07-15T23:15:27Z

blackhole.py

            if realdebrid['enabled']:
                torrentConstructors.append(RealDebridTorrent if file.torrentInfo.isDotTorrentFile else RealDebridMagnet)
+                debrid_provider = "Real-Debrid"
            if torbox['enabled']:
                torrentConstructors.append(TorboxTorrent if file.torrentInfo.isDotTorrentFile else TorboxMagnet)
+                debrid_provider = "Torbox"


They can both be enabled, so this is probably something we should just pull directly from TorrentBase type

westsurname · 2024-07-15T23:16:02Z

blackhole.py

+            discord_user = os.getenv('DISCORD_USER_TAG')
+            discord_user_tag = f"<@{discord_user}>"
+            tag_on_success = os.getenv('TAG_ON_SUCCESS', 'true').lower() == 'true'
+            tag_on_failure = os.getenv('TAG_ON_FAILURE', 'true').lower() == 'true'


Let's do this in the shared.py file in the same way as all the others.

westsurname · 2024-07-15T23:17:05Z

requirements.txt

@@ -2,7 +2,8 @@ environs==9.5.0 #all
 discord_webhook==1.3.0 #all
 requests==2.28.1 #all
 ratelimit #all
-rank-torrent-name==0.2.23 #all
+rank-torrent-name #all
+python-dotenv #all


Already using environs, no need for this.

westsurname · 2024-07-15T23:18:10Z

shared/discord.py

    embed = DiscordEmbed(title=title, description=message, color=color)
+    embed.set_author(name="Blackhole", icon_url="https://cdn.discordapp.com/attachments/1222893572521594962/1262384669161295934/black-hole-556660.png?ex=669666d7&is=66951557&hm=e792b1162ea86c1ba24ee9f4568c571ff1e3429e5b295555fea3fcb94404b434&")


discordUpdate is also used for other scripts, so we should probably do this more dynamically

westsurname · 2024-07-16T00:19:30Z

@Pukabyte Build is failing for some reason

Pukabyte added 16 commits June 20, 2024 21:54

Add Lidarr Support to blackhole.py Attempt #1 (#1)

36c93f6

* Add Lidarr Support to blackhole.py Attempt #1 - Adds Lidarr Support * Add Lidarr Variables .env.template * Lidarr Support for arr.py

Add Lidarr Blackhole and Repair to docker-compose.yml

d83928a

Update requirements.txt

89eff6f

had errors starting the repair script. change bencode3 to `#all` to fix

Update repair.py

7d3c5d9

Handles file not found errors by telling the arrs to refresh and rescan the item.

Update .env.template

48eb0a8

Update .env.template

a8e0d53

SPELLING

Update debrid.py

143e45c

Update Dockerfile.blackhole

8692d0f

Update blackhole.py

0116eb0

Update discord.py

e4123ea

Update debrid.py

ae7248a

Update arr.py

dd83e6a

Update .env.template

13bb075

Update requirements.txt

e58fccb

Update docker-compose.yml

2fe2913

Update blackhole_watcher.py

07ce647

dreulavelle reviewed Jul 14, 2024

View reviewed changes

requirements.txt Show resolved Hide resolved

Pukabyte added 7 commits July 15, 2024 03:23

Update requirements.txt

ea31c8f

Update blackhole.py

09e1c2b

Update debrid.py

7b17f46

Update .env.template

0b17d64

Update blackhole.py

46d7804

Update discord.py

a15f6e1

Update requirements.txt

f45937a

westsurname reviewed Jul 15, 2024

View reviewed changes

.env.template

Comment on lines +134 to +135

TAG_ON_SUCCESS=true

TAG_ON_FAILURE=false

Copy link

Owner

westsurname Jul 15, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Start these with DISCORD

westsurname reviewed Jul 15, 2024

View reviewed changes

Update blackhole.py

4bb08c3

westsurname reviewed Jul 15, 2024

View reviewed changes

Pukabyte closed this Dec 4, 2024

Pukabyte deleted the discord branch December 4, 2024 05:07

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Discord Notifications #21

Discord Notifications #21

Pukabyte commented Jul 14, 2024 •

edited

Loading

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

Pukabyte Jul 17, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname Jul 15, 2024

westsurname commented Jul 16, 2024

		@@ -83,26 +83,28 @@ def cleanFileName(name):

		refreshingTask = None

		async def refreshArr(arr: Arr, count=60):


		def copyFiles(file: TorrentFileInfo, folderPathMountTorrent, arr: Arr):
		# Consider removing this and always streaming

		if self.onlyLargestFile and len(mediaFiles) > 1:
		discordUpdate('largest file:', largestMediaFile['path'])

		embed = DiscordEmbed(title=title, description=message, color=color)
		embed.set_author(name="Blackhole", icon_url="https://cdn.discordapp.com/attachments/1222893572521594962/1262384669161295934/black-hole-556660.png?ex=669666d7&is=66951557&hm=e792b1162ea86c1ba24ee9f4568c571ff1e3429e5b295555fea3fcb94404b434&")

Discord Notifications #21

Discord Notifications #21

Conversation

Pukabyte commented Jul 14, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

westsurname commented Jul 16, 2024

Pukabyte commented Jul 14, 2024 •

edited

Loading