warp-beacon 2.7.14__tar.gz → 2.7.16__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (70) hide show
  1. {warp_beacon-2.7.14/warp_beacon.egg-info → warp_beacon-2.7.16}/PKG-INFO +1 -1
  2. warp_beacon-2.7.16/warp_beacon/__version__.py +2 -0
  3. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/abstract.py +1 -1
  4. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/youtube.py +9 -0
  5. {warp_beacon-2.7.14 → warp_beacon-2.7.16/warp_beacon.egg-info}/PKG-INFO +1 -1
  6. warp_beacon-2.7.14/warp_beacon/__version__.py +0 -2
  7. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/LICENSE +0 -0
  8. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/MANIFEST.in +0 -0
  9. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/README.md +0 -0
  10. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/assets/cc-group-black.png +0 -0
  11. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/assets/placeholder.gif +0 -0
  12. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/etc/.gitignore +0 -0
  13. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/etc/accounts.json +0 -0
  14. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/etc/proxies.json +0 -0
  15. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/etc/warp_beacon.conf +0 -0
  16. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/etc/warp_beacon.service +0 -0
  17. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/pyproject.toml +0 -0
  18. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/setup.cfg +0 -0
  19. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/setup.py +0 -0
  20. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/__init__.py +0 -0
  21. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/compress/__init__.py +0 -0
  22. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/compress/video.py +0 -0
  23. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/jobs/__init__.py +0 -0
  24. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/jobs/abstract.py +0 -0
  25. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/jobs/download_job.py +0 -0
  26. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/jobs/types.py +0 -0
  27. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/jobs/upload_job.py +0 -0
  28. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/mediainfo/__init__.py +0 -0
  29. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/mediainfo/abstract.py +0 -0
  30. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/mediainfo/audio.py +0 -0
  31. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/mediainfo/silencer.py +0 -0
  32. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/mediainfo/video.py +0 -0
  33. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scheduler/__init__.py +0 -0
  34. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scheduler/instagram_human.py +0 -0
  35. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scheduler/scheduler.py +0 -0
  36. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/__init__.py +0 -0
  37. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/abstract.py +0 -0
  38. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/account_selector.py +0 -0
  39. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/exceptions.py +0 -0
  40. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/fail_handler.py +0 -0
  41. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/instagram/__init__.py +0 -0
  42. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/instagram/captcha.py +0 -0
  43. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/instagram/instagram.py +0 -0
  44. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/instagram/wb_instagrapi.py +0 -0
  45. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/link_resolver.py +0 -0
  46. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/utils.py +0 -0
  47. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/__init__.py +0 -0
  48. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/music.py +0 -0
  49. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/shorts.py +0 -0
  50. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/storage/__init__.py +0 -0
  51. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/storage/mongo.py +0 -0
  52. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/__init__.py +0 -0
  53. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/bot.py +0 -0
  54. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/caption_shortener.py +0 -0
  55. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/download_status.py +0 -0
  56. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/edit_message.py +0 -0
  57. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/handlers.py +0 -0
  58. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/placeholder_message.py +0 -0
  59. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/progress_bar.py +0 -0
  60. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/progress_file_reader.py +0 -0
  61. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/types.py +0 -0
  62. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/telegram/utils.py +0 -0
  63. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/uploader/__init__.py +0 -0
  64. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/warp_beacon.py +0 -0
  65. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/yt_auth.py +0 -0
  66. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon.egg-info/SOURCES.txt +0 -0
  67. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon.egg-info/dependency_links.txt +0 -0
  68. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon.egg-info/entry_points.txt +0 -0
  69. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon.egg-info/requires.txt +0 -0
  70. {warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon.egg-info/top_level.txt +0 -0
{warp_beacon-2.7.14/warp_beacon.egg-info → warp_beacon-2.7.16}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.7.14
3
+ Version: 2.7.16
4
4
  Summary: Telegram bot for expanding external media links
5
5
  Home-page: https://github.com/sb0y/warp_beacon
6
6
  Author: Andrey Bagrintsev
warp_beacon-2.7.16/warp_beacon/__version__.py ADDED
@@ -0,0 +1,2 @@
1
+ __version__ = "2.7.16"
2
+
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/abstract.py RENAMED
@@ -340,7 +340,7 @@ class YoutubeAbstract(ScraperAbstract):
340
340
 
341
341
  yt_dlp_cookies_file = os.environ.get("YT_DLP_COOKIES_FILE", default="/var/warp_beacon/yt_dlp_cookies.txt")
342
342
  if yt_dlp_cookies_file and os.path.exists(yt_dlp_cookies_file):
343
- ydl_opts['cookiesfrombrowser'] = tuple(s.strip() for s in os.environ.get("YT_DLP_COOKIES_FROM_BROWSER", default='chrome').split(','))
343
+ #ydl_opts['cookiesfrombrowser'] = tuple(s.strip() for s in os.environ.get("YT_DLP_COOKIES_FROM_BROWSER", default='chrome').split(','))
344
344
  ydl_opts['cookiefile'] = yt_dlp_cookies_file
345
345
 
346
346
  if self.proxy:
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/warp_beacon/scraper/youtube/youtube.py RENAMED
@@ -141,11 +141,15 @@ class YoutubeScraper(YoutubeAbstract):
141
141
 
142
142
  dl_format = {}
143
143
  for f in sorted(formats, key=lambda x: (x.get('height', 0) or 0), reverse=True):
144
+ logging.info("Format: %s, ext=%s, height=%s, acodec=%s, vcodec=%s",
145
+ f.get('format_id'), f.get('ext'), f.get('height'),
146
+ f.get('acodec'), f.get('vcodec'))
144
147
  if f.get('vcodec', '') != 'none' and f.get('acodec', '') != 'none' and f.get('ext', '') == 'mp4':
145
148
  dl_format = f
146
149
  break
147
150
 
148
151
  filesize = dl_format.get('filesize', 0) or dl_format.get('filesize_approx', 0)
152
+ logging.info("[yt_dlp] File size '%d'", filesize)
149
153
  if filesize:
150
154
  if filesize > 2147483648: # 2 GiB
151
155
  logging.warning("Max resolution exceeding TG limits")
@@ -158,6 +162,11 @@ class YoutubeScraper(YoutubeAbstract):
158
162
  break
159
163
  else:
160
164
  logging.warning("Unknown filesize!")
165
+ if not dl_format:
166
+ for f in sorted(formats, key=lambda x: x.get('height', 0), reverse=True):
167
+ if f.get('vcodec') != 'none' and f.get('acodec') != 'none':
168
+ dl_format = f
169
+ break
161
170
  ydl.params['format'] = dl_format['format_id']
162
171
  ydl.download([url])
163
172
  local_file = ydl.prepare_filename(info)
{warp_beacon-2.7.14 → warp_beacon-2.7.16/warp_beacon.egg-info}/PKG-INFO RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.7.14
3
+ Version: 2.7.16
4
4
  Summary: Telegram bot for expanding external media links
5
5
  Home-page: https://github.com/sb0y/warp_beacon
6
6
  Author: Andrey Bagrintsev
warp_beacon-2.7.14/warp_beacon/__version__.py DELETED
@@ -1,2 +0,0 @@
1
- __version__ = "2.7.14"
2
-
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/LICENSE RENAMED
File without changes
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/MANIFEST.in RENAMED
File without changes
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/README.md RENAMED
File without changes
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/setup.cfg RENAMED
File without changes
{warp_beacon-2.7.14 → warp_beacon-2.7.16}/setup.py RENAMED
File without changes