warp-beacon 2.3.1__tar.gz → 2.3.3__tar.gz

{warp_beacon-2.3.1/warp_beacon.egg-info → warp_beacon-2.3.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: warp_beacon
-Version: 2.3.1
+Version: 2.3.3
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

warp_beacon-2.3.3/warp_beacon/__version__.py

@@ -0,0 +1,2 @@
+__version__ = "2.3.3"
+

{warp_beacon-2.3.1 → warp_beacon-2.3.3}/warp_beacon/mediainfo/silencer.py

@@ -1,5 +1,4 @@
-
-#import numpy as np
+import numpy as np
 import av
 
 from warp_beacon.mediainfo.video import VideoInfo
@@ -28,10 +27,14 @@ class Silencer(VideoInfo):
 						if packet:
 							out_container.mux(packet)
 							#
-							aframe = av.AudioFrame(samples=64, format='s16')
+							silent_samples = 64
+							silent_data = np.zeros((1, silent_samples), dtype=np.int16)
+							#aframe = av.AudioFrame(samples=64, format='s16')
+							aframe = av.AudioFrame.from_ndarray(silent_data, layout='mono')
 							aframe.pts = frame.pts
-							aframe.sample_rate = 16000
-							aframe.rate = 44100
+							aframe.sample_rate = 44100
+							#aframe.rate = 44100
+
 							for packet in out_audio_stream.encode(aframe):
 								out_container.mux(packet)
 

{warp_beacon-2.3.1 → warp_beacon-2.3.3}/warp_beacon/scraper/account_selector.py

@@ -1,4 +1,5 @@
 import os
+import random
 import json
 import re
 from typing import Optional
@@ -44,11 +45,16 @@ class AccountSelector(object):
 		if self.proxies:
 			try:
 				current_acc_pid = self.get_current()[1].get("proxy_id", "").strip()
+				matched_proxy = []
 				for proxy in self.proxies:
 					pid = proxy.get("id", "").strip()
 					if pid and current_acc_pid and pid == current_acc_pid:
 						logging.info("Account proxy matched '%s'", proxy)
-						return proxy
+						matched_proxy.append(proxy)
+				if matched_proxy:
+					prox_choice = random.choice(matched_proxy)
+					logging.info("Chosen proxy: '%s'", prox_choice)
+					return prox_choice
 			except Exception as e:
 				logging.warning("Error on selecting account proxy!")
 				logging.exception(e)

{warp_beacon-2.3.1 → warp_beacon-2.3.3}/warp_beacon/scraper/instagram/instagram.py

@@ -33,6 +33,7 @@ INST_SESSION_FILE_TPL = "/var/warp_beacon/inst_session_account_%d.json"
 class InstagramScraper(ScraperAbstract):
 	cl = None
 	inst_session_file = ""
+	timeline_cursor = {}
 
 	def __init__(self, account: tuple, proxy: dict=None) -> None:
 		super().__init__(account, proxy)
@@ -71,9 +72,11 @@ class InstagramScraper(ScraperAbstract):
 		})
 
 	def safe_write_session(self) -> None:
+		cl_settings = self.cl.get_settings()
+		cl_settings["warp_timeline_cursor"] = self.timeline_cursor
 		tmp_fname = "%s~" % self.inst_session_file
 		with open(tmp_fname, 'w+', encoding="utf-8") as f:
-			f.write(json.dumps(self.cl.get_settings()))
+			f.write(json.dumps(cl_settings))
 		if os.path.exists(self.inst_session_file):
 			os.unlink(self.inst_session_file)
 		os.rename(tmp_fname, self.inst_session_file)
@@ -81,7 +84,12 @@ class InstagramScraper(ScraperAbstract):
 	def load_session(self) -> None:
 		if os.path.exists(self.inst_session_file):
 			logging.info("Loading existing session file '%s'", self.inst_session_file)
-			self.cl.load_settings(self.inst_session_file)
+			with open(self.inst_session_file, 'r', encoding="utf-8") as f:
+				js = json.loads(f.read())
+				if "warp_timeline_cursor" in js:
+					self.timeline_cursor = js.get("warp_timeline_cursor", {})
+					del js["warp_timeline_cursor"]
+				self.cl.set_settings(js)
 		else:
 			self._download_hndlr(self.login)
 
@@ -94,7 +102,7 @@ class InstagramScraper(ScraperAbstract):
 
 	def validate_session(self) -> None:
 		self.load_session()
-		self._download_hndlr(self.cl.get_timeline_feed)
+		self.timeline_cursor = self._download_hndlr(self.cl.get_timeline_feed, "pull_to_refresh", self.timeline_cursor.get("next_max_id", None))
 		self._download_hndlr(self.cl.get_reels_tray_feed, "pull_to_refresh")
 		self._download_hndlr(self.cl.direct_active_presence)
 		self._download_hndlr(self.cl.reels)

{warp_beacon-2.3.1 → warp_beacon-2.3.3/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: warp_beacon
-Version: 2.3.1
+Version: 2.3.3
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev

warp_beacon-2.3.1/warp_beacon/__version__.py

@@ -1,2 +0,0 @@
-__version__ = "2.3.1"
-