warp-beacon 2.1.2__py3-none-any.whl → 2.1.4__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 (12) hide show
  1. etc/warp_beacon/warp_beacon.conf +1 -1
  2. warp_beacon/__version__.py +1 -1
  3. warp_beacon/jobs/abstract.py +2 -0
  4. warp_beacon/scraper/__init__.py +3 -2
  5. warp_beacon/scraper/instagram/instagram.py +2 -1
  6. warp_beacon/uploader/__init__.py +1 -1
  7. {warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/METADATA +1 -1
  8. {warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/RECORD +12 -12
  9. {warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/LICENSE +0 -0
  10. {warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/WHEEL +0 -0
  11. {warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/entry_points.txt +0 -0
  12. {warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/top_level.txt +0 -0
etc/warp_beacon/warp_beacon.conf CHANGED
@@ -5,7 +5,7 @@ TG_API_ID=""
5
5
  TG_API_HASH=""
6
6
  TG_BOT_NAME=""
7
7
  IG_MAX_RETRIES=10
8
- IG_REQUEST_TIMEOUT=60
8
+ IG_REQUEST_TIMEOUT=30
9
9
  MONGODB_HOST="mongodb"
10
10
  MONGODB_PORT="27017"
11
11
  MONGODB_USER="root"
warp_beacon/__version__.py CHANGED
@@ -1,2 +1,2 @@
1
- __version__ = "2.1.2"
1
+ __version__ = "2.1.4"
2
2
 
warp_beacon/jobs/abstract.py CHANGED
@@ -35,6 +35,7 @@ class JobSettings(TypedDict):
35
35
  unvailable_error_count: int
36
36
  geoblock_error_count: int
37
37
  account_switches: int
38
+ yt_auth: bool
38
39
 
39
40
  class AbstractJob(ABC):
40
41
  job_id: uuid.UUID = None
@@ -64,6 +65,7 @@ class AbstractJob(ABC):
64
65
  unvailable_error_count: int = 0
65
66
  geoblock_error_count: int = 0
66
67
  account_switches: int = 0
68
+ yt_auth: bool = False
67
69
 
68
70
  def __init__(self, **kwargs: Unpack[JobSettings]) -> None:
69
71
  if kwargs:
warp_beacon/scraper/__init__.py CHANGED
@@ -328,8 +328,9 @@ class AsyncDownloader(object):
328
328
  def notify_task_failed(self, job: DownloadJob) -> None:
329
329
  self.uploader.queue_task(job.to_upload_job(job_failed=True))
330
330
 
331
- def send_message_to_admin(self, text: str) -> None:
331
+ def send_message_to_admin(self, text: str, yt_auth: bool = False) -> None:
332
332
  self.uploader.queue_task(UploadJob.build(
333
333
  is_message_to_admin=True,
334
- message_text=text
334
+ message_text=text,
335
+ yt_auth=yt_auth
335
336
  ))
warp_beacon/scraper/instagram/instagram.py CHANGED
@@ -37,7 +37,7 @@ class InstagramScraper(ScraperAbstract):
37
37
  #
38
38
  self.inst_session_file = INST_SESSION_FILE_TPL % self.account_index
39
39
  self.cl = Client()
40
- self.cl.request_timeout = int(os.environ.get("IG_REQUEST_TIMEOUT", default=60))
40
+ #self.cl.logger.setLevel(logging.DEBUG)
41
41
  self.setup_device()
42
42
  self.cl.challenge_code_handler = self.challenge_code_handler
43
43
  self.cl.change_password_handler = self.change_password_handler
@@ -164,6 +164,7 @@ class InstagramScraper(ScraperAbstract):
164
164
  return ret_val
165
165
 
166
166
  def download_video(self, url: str, media_info: dict) -> dict:
167
+ self.cl.request_timeout = int(os.environ.get("IG_REQUEST_TIMEOUT", default=60))
167
168
  path = self._download_hndlr(self.cl.video_download_by_url, url, folder='/tmp')
168
169
  return {"local_media_path": str(path), "media_type": JobType.VIDEO, "media_info": {"duration": round(media_info.video_duration)}}
169
170
 
warp_beacon/uploader/__init__.py CHANGED
@@ -84,7 +84,7 @@ class AsyncUploader(object):
84
84
  if job is self.__JOE_BIDEN_WAKEUP:
85
85
  continue
86
86
  if job.is_message_to_admin and job.message_text and self.admin_message_callback:
87
- asyncio.ensure_future(self.admin_message_callback(job.message_text), loop=self.loop)
87
+ asyncio.ensure_future(self.admin_message_callback(job.message_text, job.yt_auth), loop=self.loop)
88
88
  continue
89
89
  path = ""
90
90
  if job.media_type == JobType.COLLECTION:
{warp_beacon-2.1.2.dist-info → warp_beacon-2.1.4.dist-info}/METADATA RENAMED
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: warp_beacon
3
- Version: 2.1.2
3
+ Version: 2.1.4
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.1.2.dist-info → warp_beacon-2.1.4.dist-info}/RECORD RENAMED
@@ -1,14 +1,14 @@
1
- etc/warp_beacon/warp_beacon.conf,sha256=JSRkUN80_UGRFqH6tMbT8mrK9_4yk2Cu-ch0MIa_G8I,317
1
+ etc/warp_beacon/warp_beacon.conf,sha256=LNq6YThFSadZKGrsAfMVFWX7liBwePAXeApdEz9ZppE,317
2
2
  lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuwwPfa2mDLUA,372
3
3
  var/warp_beacon/accounts.json,sha256=rKFQM_b9eoDS4mJ1B_SZNolPLXx1SQdQMdY2F_ZcBt8,1523
4
4
  var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
5
5
  warp_beacon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
6
- warp_beacon/__version__.py,sha256=KZy4RjcpKWaxkEJsyzc783XkcFsr20uxQTTBWUEt-Og,23
6
+ warp_beacon/__version__.py,sha256=rpWjmL83w-TxF079BUHpKKyyd1QWCxSYIg5roHhILTE,23
7
7
  warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
8
8
  warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
9
9
  warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
10
10
  warp_beacon/jobs/__init__.py,sha256=ED8_tPle4iL4kqNW0apAVkgNQtRRTnYfAJwBjO1g0JY,180
11
- warp_beacon/jobs/abstract.py,sha256=eJFz2ZDkLJYMOgX3q6A8nnF75Iu2Yfypv2ipum8MuV8,2681
11
+ warp_beacon/jobs/abstract.py,sha256=_fgaeNGmtGnzWbXF0hDqsH4okAlDHRdIE6RYuGM4sIA,2719
12
12
  warp_beacon/jobs/download_job.py,sha256=5HiPcnJppFMhO14___3eSkoMygM3y-vhpGkMAuNhK7s,854
13
13
  warp_beacon/jobs/types.py,sha256=Ae8zINgbs7cOcYkYoOCOACA7duyhnIGMQAJ_SJB1QRQ,176
14
14
  warp_beacon/jobs/upload_job.py,sha256=_ul4psPej1jLEs-BMcMR80GbXDSmm38jE9yoZtecclY,741
@@ -17,12 +17,12 @@ warp_beacon/mediainfo/abstract.py,sha256=ZR2JMuRpoh7nDNov9a8YkAfr6BI2HXnXzQtVrLg
17
17
  warp_beacon/mediainfo/audio.py,sha256=ous88kwQj4bDIChN5wnGil5LqTs0IQHH0d-nyrL0-ZM,651
18
18
  warp_beacon/mediainfo/silencer.py,sha256=MgUc9Ibbhjhg9GbJMNfJqrdDkMsQShZkQ1sCwvW_-qI,1647
19
19
  warp_beacon/mediainfo/video.py,sha256=AIRy_op_BvehsjarM1rvT5Qo0QWwf-Q6xVVd_aCnbJ4,2505
20
- warp_beacon/scraper/__init__.py,sha256=dbE3aVOnpxAfEtr7ATcrbJOrzoManm3bfhATdytX2wQ,14321
20
+ warp_beacon/scraper/__init__.py,sha256=J3eAluWa5nZmLcA_TPj-fp4p5XAa2g5mqSksY4rpCAg,14364
21
21
  warp_beacon/scraper/abstract.py,sha256=aNZ9ypF9B8BjflcIwi-7wEzIqF-XPeF0xvfX9CP_iIw,2708
22
22
  warp_beacon/scraper/account_selector.py,sha256=0NO1cXJSHNncjh7cknv66hyc5nPZJCHqbqDFQyBWkTE,2763
23
23
  warp_beacon/scraper/exceptions.py,sha256=TWIMpJeDtt5lxov7XJbMNPPW6NnClFG6TgvLvdaAubE,1325
24
24
  warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
25
- warp_beacon/scraper/instagram/instagram.py,sha256=BmgJoTJfmFYNlytr7NhJCPrug-HGf8y1GJjeQfSq0rc,13259
25
+ warp_beacon/scraper/instagram/instagram.py,sha256=6CEk7nF-YInX7hSGm6GmkSSLZ2OjBh8BJQVR3vw_Qms,13301
26
26
  warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
27
27
  warp_beacon/scraper/youtube/abstract.py,sha256=UX6TWEM5x4C_FZpifB8IGW9WRgrxYcctA_HMqR_XEvo,6051
28
28
  warp_beacon/scraper/youtube/music.py,sha256=8TguqXc1BC9Slp09BzCU8dtQ6BnyKwzZSLLFHpqDHtg,1498
@@ -34,10 +34,10 @@ warp_beacon/telegram/bot.py,sha256=h5yK79a9mxahCGxR0gaRcSdHXXqLhVANDdXZxGUIS2U,1
34
34
  warp_beacon/telegram/handlers.py,sha256=MTcHZmWe8RAcZdicnqQewy_SkwujhnaoqJgWHpebfVs,6350
35
35
  warp_beacon/telegram/placeholder_message.py,sha256=u5kVfTjGmVYkwA5opniRltHXGpsdSxI41WEde8J5os0,6418
36
36
  warp_beacon/telegram/utils.py,sha256=LdCU4ChJHyzpCvyG5v3XcUtUgK3v5by_v8D56VsPeI0,2171
37
- warp_beacon/uploader/__init__.py,sha256=qODBuIvWtypQQyKl3Y0QiBXC5SipVFL4b64D91EmTyw,4764
38
- warp_beacon-2.1.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
39
- warp_beacon-2.1.2.dist-info/METADATA,sha256=rd_Y3D_tg5GUdgs2EAc3CUoxLumWLVzSkh-zzYYOk9Q,21250
40
- warp_beacon-2.1.2.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
41
- warp_beacon-2.1.2.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
42
- warp_beacon-2.1.2.dist-info/top_level.txt,sha256=SIMha34qjGXaijMgtzESgQ-Cu-KbLHbmQacwue_ggTY,917
43
- warp_beacon-2.1.2.dist-info/RECORD,,
37
+ warp_beacon/uploader/__init__.py,sha256=BQ5rli0soLf0FGqCpivVh9w6lyoGM10-ck2mUjnoOLU,4777
38
+ warp_beacon-2.1.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
39
+ warp_beacon-2.1.4.dist-info/METADATA,sha256=HIq1xljfc7nYePd1NVp9x7gn4S9AqwHPUzDcbC_nWjQ,21250
40
+ warp_beacon-2.1.4.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
41
+ warp_beacon-2.1.4.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
42
+ warp_beacon-2.1.4.dist-info/top_level.txt,sha256=SIMha34qjGXaijMgtzESgQ-Cu-KbLHbmQacwue_ggTY,917
43
+ warp_beacon-2.1.4.dist-info/RECORD,,