warp-beacon 2.3.1__py3-none-any.whl → 2.3.2__py3-none-any.whl

warp_beacon/__version__.py

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

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.dist-info → warp_beacon-2.3.2.dist-info}/METADATA

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

{warp_beacon-2.3.1.dist-info → warp_beacon-2.3.2.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=d8xsJ2T7T4QeQAnN5wVA8skG3vnUUxDhMK7Uqg1maGI,23
+warp_beacon/__version__.py,sha256=JfKUaL7n98eqlX_JI_xJDb_8DEBmEFvzpBEfmwkle3Y,23
 warp_beacon/warp_beacon.py,sha256=7KEtZDj-pdhtl6m-zFLsSojs1ZR4o7L0xbqtdmYPvfE,342
 warp_beacon/compress/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/compress/video.py,sha256=_PDMVYCyzLYxHv1uZmmzGcG_8rjaZr7BTXsXTTy_oS4,2846
@@ -27,7 +27,7 @@ warp_beacon/scraper/exceptions.py,sha256=Qkz76yo-X5kucEZIP9tWaK-oYO-kvsPEl8Y0W63
 warp_beacon/scraper/fail_handler.py,sha256=_blvckfTZ4xWVancQKVRXH5ClKGwfrBxMwvXIFZh1qA,975
 warp_beacon/scraper/link_resolver.py,sha256=Rc9ZuMyOo3iPywDHwjngy-WRQ2SXhJwxcg-5ripx7tM,2447
 warp_beacon/scraper/instagram/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/scraper/instagram/instagram.py,sha256=_0GeWXP4m1hKkbjmo771t67w8rrr0u2CuLJtgecp6c8,13180
+warp_beacon/scraper/instagram/instagram.py,sha256=b10mk8IGX9vDKcMVrCXvcELUSEmwOLUJJVKOuFTQSa8,13592
 warp_beacon/scraper/youtube/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/scraper/youtube/abstract.py,sha256=cBtExei2Cb3o4YBtHqi8If_FdmE6NyJqNKacm5aw7S0,9243
 warp_beacon/scraper/youtube/music.py,sha256=qbijpSv54fsrIYHeY-nfmw4vo6oBmedQHsVG8pXNfrc,1380
@@ -41,9 +41,9 @@ warp_beacon/telegram/handlers.py,sha256=sefkG9jU85m4oMxkJ8WqA4aiJLLBv98OIgYxY49c
 warp_beacon/telegram/placeholder_message.py,sha256=wN9-BRiyrtHG-EvXtZkGJHt2CX71munQ57ITttjt0mw,6400
 warp_beacon/telegram/utils.py,sha256=6oEOEzyN9fAmUZVbk5sjFyHcsPrrb2IlI3zXnRCwjHU,2403
 warp_beacon/uploader/__init__.py,sha256=5KRWsxPRGuQ56YhCEnJsXnb-yQp8dpvWEsPDf0dD-fw,4964
-warp_beacon-2.3.1.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-2.3.1.dist-info/METADATA,sha256=Kn998t53Rwdu-CEesyoR2YA7Ub-orjjdefPMv3lzD3o,21703
-warp_beacon-2.3.1.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
-warp_beacon-2.3.1.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-2.3.1.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
-warp_beacon-2.3.1.dist-info/RECORD,,
+warp_beacon-2.3.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-2.3.2.dist-info/METADATA,sha256=NRiJouz-RpEyGITvSGGFCBuujXa49y23DW_35dabMUw,21703
+warp_beacon-2.3.2.dist-info/WHEEL,sha256=jB7zZ3N9hIM9adW7qlTAyycLYW9npaWKLRzaoVcLKcM,91
+warp_beacon-2.3.2.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-2.3.2.dist-info/top_level.txt,sha256=XusFB1mGUStI2gqbtRuJzQrfrAXmdMaT3QTyfvdLEXI,1064
+warp_beacon-2.3.2.dist-info/RECORD,,