warp-beacon 2.8.16__py3-none-any.whl → 2.8.18__py3-none-any.whl

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 (10) hide show
  1. warp_beacon/__version__.py +1 -1
  2. warp_beacon/scraper/X/X.py +3 -3
  3. warp_beacon/telegram/handlers.py +1 -1
  4. warp_beacon/uploader/__init__.py +10 -10
  5. {warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/METADATA +1 -1
  6. {warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/RECORD +10 -10
  7. {warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/WHEEL +0 -0
  8. {warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/entry_points.txt +0 -0
  9. {warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/licenses/LICENSE +0 -0
  10. {warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/top_level.txt +0 -0
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.8.16"
1
+ __version__ = "2.8.18"
2
2
 
warp_beacon/scraper/X/X.py CHANGED
@@ -20,10 +20,10 @@ class XScraper(XAbstract):
20
20
  def extract_canonical_name(self, media: dict) -> str:
21
21
  ret = ""
22
22
  try:
23
- if media.get("title", None):
23
+ if media.get("title"):
24
24
  ret = media["title"]
25
- if media.get("description", ""):
26
- ret += "\n" + media["description"]
25
+ elif media.get("description"):
26
+ ret = media["description"]
27
27
  except Exception as e:
28
28
  logging.warning("Failed to extract canonical media name!")
29
29
  logging.exception(e)
warp_beacon/telegram/handlers.py CHANGED
@@ -177,7 +177,7 @@ class Handlers(object):
177
177
  url = new_url
178
178
  origin = Origin.YOUTUBE
179
179
  if origin is Origin.UNKNOWN:
180
- logging.info("Only Instagram, YouTube Shorts and YouTube Music are now supported. Skipping.")
180
+ logging.info("Only Instagram, YouTube Shorts, YouTube Music and X are now supported. Skipping.")
181
181
  continue
182
182
  entities, tg_file_ids = [], []
183
183
  uniq_id = Storage.compute_uniq(url)
warp_beacon/uploader/__init__.py CHANGED
@@ -12,7 +12,6 @@ from warp_beacon.storage import Storage
12
12
 
13
13
  class AsyncUploader(object):
14
14
  __JOE_BIDEN_WAKEUP = None
15
- pool_size = 1
16
15
 
17
16
  def __init__(self,
18
17
  loop: asyncio.AbstractEventLoop,
@@ -22,6 +21,7 @@ class AsyncUploader(object):
22
21
  request_yt_auth_callback: Callable,
23
22
  pool_size: int=min(32, os.cpu_count() + 4)
24
23
  ) -> None:
24
+ self.allow_loop = True
25
25
  self.threads = []
26
26
  self.in_process = set()
27
27
  self.storage = storage
@@ -64,6 +64,9 @@ class AsyncUploader(object):
64
64
  def queue_task(self, job: UploadJob) -> None:
65
65
  self.job_queue.put_nowait(job)
66
66
 
67
+ async def callback_wrap(self, *args, **kwargs) -> None:
68
+ await self.upload_wrapper(*args, **kwargs)
69
+
67
70
  def do_work(self) -> None:
68
71
  logging.info("Upload worker started")
69
72
  while self.allow_loop:
@@ -102,16 +105,13 @@ class AsyncUploader(object):
102
105
  else:
103
106
  logging.info("Accepted upload job, file(s): '%s'", path)
104
107
 
105
- async def callback_wrap(*args, **kwargs) -> None:
106
- await self.upload_wrapper(*args, **kwargs)
107
-
108
108
  try:
109
109
  if job.job_failed:
110
110
  logging.info("URL '%s' download failed. Skipping upload job ...", job.url)
111
111
  if job.job_failed_msg: # we want to say something to user
112
112
  self.loop.call_soon_threadsafe(
113
113
  asyncio.create_task,
114
- callback_wrap(job)
114
+ self.callback_wrap(job)
115
115
  )
116
116
  self.process_done(uniq_id)
117
117
  continue
@@ -119,7 +119,7 @@ class AsyncUploader(object):
119
119
  if job.replay:
120
120
  self.loop.call_soon_threadsafe(
121
121
  asyncio.create_task,
122
- callback_wrap(job)
122
+ self.callback_wrap(job)
123
123
  )
124
124
  continue
125
125
 
@@ -128,7 +128,7 @@ class AsyncUploader(object):
128
128
  if job.job_warning_msg:
129
129
  self.loop.call_soon_threadsafe(
130
130
  asyncio.create_task,
131
- callback_wrap(job)
131
+ self.callback_wrap(job)
132
132
  )
133
133
  continue
134
134
  if in_process:
@@ -146,7 +146,7 @@ class AsyncUploader(object):
146
146
  job.canonical_name = db_data.get("canonical_name", "")
147
147
  self.loop.call_soon_threadsafe(
148
148
  asyncio.create_task,
149
- callback_wrap(job)
149
+ self.callback_wrap(job)
150
150
  )
151
151
  self.process_done(uniq_id)
152
152
  else:
@@ -154,7 +154,7 @@ class AsyncUploader(object):
154
154
  else:
155
155
  self.loop.call_soon_threadsafe(
156
156
  asyncio.create_task,
157
- callback_wrap(job)
157
+ self.callback_wrap(job)
158
158
  )
159
159
  self.process_done(uniq_id)
160
160
  except Exception as e:
@@ -164,4 +164,4 @@ class AsyncUploader(object):
164
164
  except Exception as e:
165
165
  logging.error("Exception occurred inside upload worker!")
166
166
  logging.exception(e)
167
- logging.info("Thread done")
167
+ logging.info("Thread done")
{warp_beacon-2.8.16.dist-info → warp_beacon-2.8.18.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: warp_beacon
3
- Version: 2.8.16
3
+ Version: 2.8.18
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.8.16.dist-info → warp_beacon-2.8.18.dist-info}/RECORD RENAMED
@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
4
4
  var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
5
5
  var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
6
6
  warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
7
- warp_beacon/__version__.py,sha256=9j8dYjzjanXTCo3lfOVfAZGCuvknHdNoJReyvG-GYZk,24
7
+ warp_beacon/__version__.py,sha256=fwWxOJ_lUuzIm9-N1bWjdNmXUdIHuFfaEBVD9K3nhEQ,24
8
8
  warp_beacon/warp_beacon.py,sha256=ADCR30uGXIsDrt9WoiI9Ghu2QtWs0qZIK6x3pQKM_B4,1109
9
9
  warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
10
10
  warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -29,7 +29,7 @@ warp_beacon/scraper/exceptions.py,sha256=hicAe6_0xN7Ry2gcFX4UvqPWMtF_lX2ihH1njQA
29
29
  warp_beacon/scraper/fail_handler.py,sha256=hu0mGS6zeyo3VV86XORvCIWbTApcb2bE_EBoxANpFPo,1529
30
30
  warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
31
31
  warp_beacon/scraper/utils.py,sha256=AOZmDki2Pbr84IG-j_wN2UghKCiWFVDYdx6HJl0JTBs,1258
32
- warp_beacon/scraper/X/X.py,sha256=lKxNe70iIasLnyN8QA_1rLa70Bd3Y9fL6J4AEdUgNJs,9200
32
+ warp_beacon/scraper/X/X.py,sha256=XsQ76A4OIHIMrCIWBJYunfU35bz6SgNrU179-ZoZqyc,9184
33
33
  warp_beacon/scraper/X/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
34
34
  warp_beacon/scraper/X/abstract.py,sha256=pCzZPTCtn8pRbBx2SeuBUpMkEHqnOLtwLBAHYceL12Q,5475
35
35
  warp_beacon/scraper/X/types.py,sha256=RrAyODNA8WA0YzznOSK2wr-hstXf3BnEisy06uL-bdA,132
@@ -49,16 +49,16 @@ warp_beacon/telegram/bot.py,sha256=DdVgW1SraCabgruEzOKRzh2-Gbn8JDSzxEqcMKeDMHg,2
49
49
  warp_beacon/telegram/caption_shortener.py,sha256=EnguNCF52ne7y4P-iJAbI6K3sqoJqJbND_dX5Fhwkv0,1549
50
50
  warp_beacon/telegram/download_status.py,sha256=N-Qg13LVcPskyQNKG1lw50K1lhFtXu003muCRzZ7wiE,1561
51
51
  warp_beacon/telegram/edit_message.py,sha256=vzSrtlt-QxBU-X9uRSKo7gJftOrvB5Qo3iNsVNptCoE,5684
52
- warp_beacon/telegram/handlers.py,sha256=hA5rzfYcCoU6KJE1YMkEkQnv_B06UiSvJDeqr4JbhXw,10376
52
+ warp_beacon/telegram/handlers.py,sha256=EcTi_F5X1Aw6jomqyLpcfjvfffiTFgVA-Z-3Di6SQ_4,10379
53
53
  warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
54
54
  warp_beacon/telegram/progress_bar.py,sha256=IP4xtvLtdJtqdr2C-0YaU428iQGrKurbP4Npr31iW74,5014
55
55
  warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDHTzP78Mx5tdvPPWs,969
56
56
  warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
57
57
  warp_beacon/telegram/utils.py,sha256=zTF8VQfAWetBSjAPbmNe_Zi_LN5fAcWptJKjLaFNHaE,5073
58
- warp_beacon/uploader/__init__.py,sha256=zYHDg23RIAaY0HST8BCo8JFyM-oiq31hZ7EDwf9NvFw,4862
59
- warp_beacon-2.8.16.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
60
- warp_beacon-2.8.16.dist-info/METADATA,sha256=HR43pAdA8_kTn0nhYsM7DtLJp-8bjuqOPGhRJDW3arI,23236
61
- warp_beacon-2.8.16.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
62
- warp_beacon-2.8.16.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
63
- warp_beacon-2.8.16.dist-info/top_level.txt,sha256=RraB0PWGvRK2zPYkuICKNgStLG1C5s7rPHHJEHJbkgA,1510
64
- warp_beacon-2.8.16.dist-info/RECORD,,
58
+ warp_beacon/uploader/__init__.py,sha256=qbjl6PhnLxYr-fXsL-EzL8XwmUDDSHb3DrSL-rs1sjo,4894
59
+ warp_beacon-2.8.18.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
60
+ warp_beacon-2.8.18.dist-info/METADATA,sha256=vsihjj_Zd1yjr2Q_JTfZIy7J0T74hBprcVmR-rF1WJw,23236
61
+ warp_beacon-2.8.18.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
62
+ warp_beacon-2.8.18.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
63
+ warp_beacon-2.8.18.dist-info/top_level.txt,sha256=RraB0PWGvRK2zPYkuICKNgStLG1C5s7rPHHJEHJbkgA,1510
64
+ warp_beacon-2.8.18.dist-info/RECORD,,