warp-beacon 2.2.57__tar.gz → 2.2.59__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 (54) hide show
  1. {warp_beacon-2.2.57/warp_beacon.egg-info → warp_beacon-2.2.59}/PKG-INFO +1 -1
  2. warp_beacon-2.2.59/warp_beacon/__version__.py +2 -0
  3. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/youtube/music.py +1 -2
  4. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/telegram/handlers.py +2 -0
  5. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/telegram/utils.py +17 -0
  6. {warp_beacon-2.2.57 → warp_beacon-2.2.59/warp_beacon.egg-info}/PKG-INFO +1 -1
  7. warp_beacon-2.2.57/warp_beacon/__version__.py +0 -2
  8. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/LICENSE +0 -0
  9. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/MANIFEST.in +0 -0
  10. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/README.md +0 -0
  11. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/assets/placeholder.gif +0 -0
  12. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/etc/.gitignore +0 -0
  13. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/etc/accounts.json +0 -0
  14. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/etc/warp_beacon.conf +0 -0
  15. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/etc/warp_beacon.service +0 -0
  16. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/pyproject.toml +0 -0
  17. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/setup.cfg +0 -0
  18. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/setup.py +0 -0
  19. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/__init__.py +0 -0
  20. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/compress/__init__.py +0 -0
  21. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/compress/video.py +0 -0
  22. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/jobs/__init__.py +0 -0
  23. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/jobs/abstract.py +0 -0
  24. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/jobs/download_job.py +0 -0
  25. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/jobs/types.py +0 -0
  26. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/jobs/upload_job.py +0 -0
  27. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/mediainfo/__init__.py +0 -0
  28. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/mediainfo/abstract.py +0 -0
  29. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/mediainfo/audio.py +0 -0
  30. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/mediainfo/silencer.py +0 -0
  31. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/mediainfo/video.py +0 -0
  32. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scheduler/__init__.py +0 -0
  33. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scheduler/scheduler.py +0 -0
  34. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/__init__.py +0 -0
  35. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/abstract.py +0 -0
  36. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/account_selector.py +0 -0
  37. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/exceptions.py +0 -0
  38. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/instagram/__init__.py +0 -0
  39. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/instagram/instagram.py +0 -0
  40. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/youtube/__init__.py +0 -0
  41. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/youtube/abstract.py +0 -0
  42. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/youtube/shorts.py +0 -0
  43. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/scraper/youtube/youtube.py +0 -0
  44. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/storage/__init__.py +0 -0
  45. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/telegram/__init__.py +0 -0
  46. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/telegram/bot.py +0 -0
  47. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/telegram/placeholder_message.py +0 -0
  48. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/uploader/__init__.py +0 -0
  49. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon/warp_beacon.py +0 -0
  50. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon.egg-info/SOURCES.txt +0 -0
  51. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon.egg-info/dependency_links.txt +0 -0
  52. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon.egg-info/entry_points.txt +0 -0
  53. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon.egg-info/requires.txt +0 -0
  54. {warp_beacon-2.2.57 → warp_beacon-2.2.59}/warp_beacon.egg-info/top_level.txt +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: warp_beacon
3
- Version: 2.2.57
3
+ Version: 2.2.59
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
@@ -0,0 +1,2 @@
1
+ __version__ = "2.2.59"
2
+
@@ -33,8 +33,7 @@ class YoutubeMusicScraper(YoutubeAbstract):
33
33
  max_retries=0,
34
34
  timeout=timeout,
35
35
  skip_existing=False,
36
- filename_prefix='yt_download_',
37
- mp3=True
36
+ filename_prefix='yt_download_'
38
37
  )
39
38
  logging.debug("Temp filename: '%s'", local_file)
40
39
  res.append({
@@ -74,6 +74,8 @@ class Handlers(object):
74
74
  else:
75
75
  for url in urls:
76
76
  origin = Utils.extract_origin(url)
77
+ if origin is Origin.INSTAGRAM:
78
+ url = Utils.convert_ig_share_link(url)
77
79
  if origin is Origin.YOUTU_BE:
78
80
  url = Utils.extract_youtu_be_link(url)
79
81
  if not url:
@@ -2,6 +2,7 @@ from typing import Union
2
2
 
3
3
  import re
4
4
  import requests
5
+ from urllib.parse import urlparse
5
6
 
6
7
  from pyrogram.types import Message
7
8
 
@@ -57,6 +58,22 @@ class Utils(object):
57
58
  logging.exception(e)
58
59
 
59
60
  return ''
61
+
62
+ @staticmethod
63
+ def convert_ig_share_link(url: str) -> str:
64
+ # expected url: https://www.instagram.com/share/reel/BAHtk2AamB
65
+ # result url: https://www.instagram.com/reel/DAKjQgUNzuH/
66
+ try:
67
+ if "instagram.com/" in url and "share" in url and "reel" in url:
68
+ reel_id = urlparse(url).path.split[-1]
69
+ new_url = f'https://www.instagram.com/reel/{reel_id}/'
70
+ logging.info("Converted IG share link to '%s'", new_url)
71
+ return new_url
72
+ except Exception as e:
73
+ logging.error("Failed to convert IG share link!")
74
+ logging.exception(e)
75
+
76
+ return url
60
77
 
61
78
  @staticmethod
62
79
  def parse_expected_patronum_error(err_text: str) -> tuple:
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: warp_beacon
3
- Version: 2.2.57
3
+ Version: 2.2.59
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
@@ -1,2 +0,0 @@
1
- __version__ = "2.2.57"
2
-
File without changes
File without changes
File without changes
File without changes
File without changes