warp-beacon 2.6.83__py3-none-any.whl → 2.6.84__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "2.6.83"
+__version__ = "2.6.84"
 

warp_beacon/scheduler/scheduler.py

@@ -13,13 +13,13 @@ import warp_beacon
 class IGScheduler(object):
 	state_file = "/var/warp_beacon/scheduler_state.json"
 	yt_sessions_dir = "/var/warp_beacon"
-	downloader = None
-	running = True
-	thread = None
-	event = None
-	state = {"remaining": randrange(8400, 26200), "yt_sess_exp": []}
 
 	def __init__(self, downloader: warp_beacon.scraper.AsyncDownloader) -> None:
+		self.downloader = None
+		self.running = True
+		self.thread = None
+		self.event = None
+		self.state = {"remaining": randrange(8400, 26200), "yt_sess_exp": []}
 		self.downloader = downloader
 		self.event = threading.Event()
 		self.handle_time_planning()
@@ -37,9 +37,7 @@ class IGScheduler(object):
 
 	def load_yt_sessions(self) -> None:
 		try:
-			# old versions migration
-			if not "yt_sess_exp" in self.state:
-				self.state["yt_sess_exp"] = []
+			self.state["yt_sess_exp"] = []
 			
 			for f in os.listdir(self.yt_sessions_dir):
 				if f.startswith("yt_session") and f.endswith(".json"):
@@ -134,6 +132,7 @@ class IGScheduler(object):
 		self.load_state()
 		while self.running:
 			try:
+				self.load_yt_sessions()
 				yt_expires = self.yt_nearest_expire()
 				ig_sched = self.state["remaining"]
 				min_val = min(yt_expires, ig_sched)

warp_beacon/scraper/instagram/wb_instagrapi.py

@@ -43,7 +43,19 @@ class WBClient(Client):
 			raise TypeError("Progress callback must be callable")
 		self.progress_callback = callback
 
+	def adaptive_chunk_size(self, content_length: int) -> int:
+		if content_length < 100_000:
+			return 2048
+		elif content_length < 5_000_000:
+			return 8192
+		elif content_length < 100_000_000:
+			return 32768
+		else:
+			return 65536
+
 	def sanitize_instagram_url(self, url: str) -> str:
+		if "oh=" in url: # signed url, do not touch
+				return url
 		parsed = urlparse(url)
 		query = parse_qs(parsed.query)
 		filtered_query = {k: v for k, v in query.items() if k in self.essential_params}
@@ -51,7 +63,7 @@ class WBClient(Client):
 		return urlunparse(parsed._replace(query=new_query))
 
 	def video_download_by_url(self, url: str, filename: str = "", folder: Path = "") -> Path:
-		#url = self.sanitize_instagram_url(url)
+		url = self.sanitize_instagram_url(url)
 		fname = urlparse(url).path.rsplit("/", 1)[1]
 		filename = f"{filename}.{fname.rsplit('.', 1)[1]}" if filename else fname
 		path = Path(folder or Path.cwd()) / filename
@@ -78,7 +90,7 @@ class WBClient(Client):
 
 		downloaded = 0
 		with open(path, "wb") as f:
-			for chunk in response.iter_content(chunk_size=8192):
+			for chunk in response.iter_content(chunk_size=self.adaptive_chunk_size(content_length)):
 				if chunk:
 					f.write(chunk)
 					downloaded += len(chunk)
@@ -103,7 +115,7 @@ class WBClient(Client):
 	def photo_download_by_url(
 		self, url: str, filename: str = "", folder: Path = ""
 	) -> Path:
-		#url = self.sanitize_instagram_url(url)
+		url = self.sanitize_instagram_url(url)
 		fname = urlparse(url).path.rsplit("/", 1)[1]
 		filename = f"{filename}.{(filename, fname.rsplit('.', 1)[1]) if filename else fname}"
 		path = Path(folder) / filename
@@ -136,7 +148,7 @@ class WBClient(Client):
 		downloaded = 0
 		with open(path, "wb") as f:
 			response.raw.decode_content = True
-			for chunk in response.iter_content(chunk_size=4096):
+			for chunk in response.iter_content(chunk_size=self.adaptive_chunk_size(content_length)):
 				if chunk:
 					f.write(chunk)
 					downloaded += len(chunk)

{warp_beacon-2.6.83.dist-info → warp_beacon-2.6.84.dist-info}/METADATA

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

{warp_beacon-2.6.83.dist-info → warp_beacon-2.6.84.dist-info}/RECORD

@@ -4,7 +4,7 @@ var/warp_beacon/accounts.json,sha256=OsXdncs6h88xrF_AP6_WDCK1waGBn9SR-uYdIeK37GM
 var/warp_beacon/placeholder.gif,sha256=cE5CGJVaop4Sx21zx6j4AyoHU0ncmvQuS2o6hJfEH88,6064
 var/warp_beacon/proxies.json,sha256=VnjlQDXumOEq72ZFjbh6IqHS1TEHqn8HPYAZqWCeSIA,95
 warp_beacon/__init__.py,sha256=_rThNODmz0nDp_n4mWo_HKaNFE5jk1_7cRhHyYaencI,163
-warp_beacon/__version__.py,sha256=JhRCYkX8KEsqFL6rDZYJKbIdOmCFlKJ-h03RpsX_Mrs,24
+warp_beacon/__version__.py,sha256=sVfzhpFl0Ti_WQWBe-4XO6fhB_2n-4RIx64CMN0X7PY,24
 warp_beacon/warp_beacon.py,sha256=ED43vNzdjDUJ_9qLCbri0bjWLWEJ69BENGj9i7G6AvM,342
 warp_beacon/yt_auth.py,sha256=GUTKqYr_tzDC-07Lx_ahWXSag8EyLxXBUnQbDBIkEmk,6022
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -21,7 +21,7 @@ warp_beacon/mediainfo/silencer.py,sha256=qxMuViOoVwUYb60uCVvqHiGrqByR1_4_rqMT-Xd
 warp_beacon/mediainfo/video.py,sha256=UBZrhTN5IDI-aYu6tsJEILo9nFkjHhkldGVFmvV7tEI,2480
 warp_beacon/scheduler/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scheduler/instagram_human.py,sha256=Li8R8Fm9sZCXCJnS4RrQnQJTsPlBPENQowRe_23Bu-Y,8207
-warp_beacon/scheduler/scheduler.py,sha256=9OCh7Ta4wY_aTHGAOOZmaKXg56Ftx1N_aV1g6E3ZLKA,4941
+warp_beacon/scheduler/scheduler.py,sha256=C-19tIb6iiHfboKNPDjg9tzhJQ3mNEbHywW9foe7nKw,4931
 warp_beacon/scraper/__init__.py,sha256=buXmGcJnwCi0qGZAh3srcSbww0XvKyTACp_DW11e86Q,20225
 warp_beacon/scraper/abstract.py,sha256=hRyBbdZ5HK7QyyXlbFAgk3FZe2SIil0WBZ9vJziZv_s,3554
 warp_beacon/scraper/account_selector.py,sha256=VmXH8SHZqQ6a2mrt2agzDWepE3v46QrFLL3OqVwJ2A4,9731
@@ -32,7 +32,7 @@ warp_beacon/scraper/utils.py,sha256=xJfCVhiLjVPoFVupE10sTzX7UpgNWbx2EeYIsoYXGDk,
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/instagram/captcha.py,sha256=9UYziuqB3Tsat_ET6ex-cnZDbi6yCnsXHSpmE8MuUHk,4651
 warp_beacon/scraper/instagram/instagram.py,sha256=3KhxVQSL3lzovu9hjMA83sCv87u4TTDMfDQrxogoWak,17179
-warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=QJtJ2Gn0fpnWwisOMB2vkMunhTil-rOW7MREr5hOWXI,4924
+warp_beacon/scraper/instagram/wb_instagrapi.py,sha256=Dh0SlCZcrgLC4IsIqKUV3xszQXKlrdsll0nCAxoiXHI,5289
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=K2ovycq1lkx0a2R1FddO3B0IcaVsVzni_fdXzajGdwg,13134
 warp_beacon/scraper/youtube/music.py,sha256=5AeSBQyUgVCJT2hoBCV2WvlyuV9US09SYJhmBG_P9F8,2755
@@ -52,9 +52,9 @@ warp_beacon/telegram/progress_file_reader.py,sha256=e3equyNKlKs764AD-iE9QRsh3YDH
 warp_beacon/telegram/types.py,sha256=Kvdng6uCF1HRoqQgGW1ZYYPJoVuYkFb-LDvMBbW5Hjk,89
 warp_beacon/telegram/utils.py,sha256=1Lq67aRylVJzbwSyvAgjPAGjJZFATkICvAj3TJGuJiM,4635
 warp_beacon/uploader/__init__.py,sha256=j3qcuKhpchseZLGzSsSiogqe6WdMbkK8d3I-ConhNRs,5687
-warp_beacon-2.6.83.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.6.83.dist-info/METADATA,sha256=CPtZD6nUsf73ZOgq4xsxIXYc0VGtSgXeolQ1A4OXLtc,22706
-warp_beacon-2.6.83.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
-warp_beacon-2.6.83.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.6.83.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
-warp_beacon-2.6.83.dist-info/RECORD,,
+warp_beacon-2.6.84.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.6.84.dist-info/METADATA,sha256=h1DIdxgSyWRQ3H2kNwxfugeIvva3rCmBz_JW1VFlpwg,22706
+warp_beacon-2.6.84.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+warp_beacon-2.6.84.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.6.84.dist-info/top_level.txt,sha256=5YQRN46STNg81V_3jdzZ6bftkMxhe1hTPSFvJugDu84,1405
+warp_beacon-2.6.84.dist-info/RECORD,,