warp-beacon 2.3.0__tar.gz → 2.3.2__tar.gz

{warp_beacon-2.3.0/warp_beacon.egg-info → warp_beacon-2.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: warp_beacon
-Version: 2.3.0
+Version: 2.3.2
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -277,12 +277,16 @@ TG_BOT_ADMIN_USERNAME=""
 ###
 INSTAGRAM_LOGIN="instagram login (email or cell phone)"
 INSTAGRAM_PASSWORD="instgram password"
-INSTAGRAM_VERIFICATION_CODE="instagram 2FA if required, default empty"
 MONGODB_HOST="mongodb"
 MONGODB_PORT="27017"
 MONGODB_USER="root"
 MONGODB_PASSWORD="changeme"
-VIDEO_STORAGE_DIR="/var/warp_beacon/videos"
+# more information about accounts.json and proxies.json
+# can be found in project wiki
+# https://github.com/sb0y/warp_beacon/wiki/Introduction-in-account.json-file
+SERVICE_ACCOUNTS_FILE=/var/warp_beacon/accounts.json
+PROXY_FILE=/var/warp_beacon/proxies.json
+
 # workers settings
 # default: min(32, os.cpu_count() + 4)
 #TG_WORKERS_POOL_SIZE=3
@@ -399,6 +403,10 @@ build deb file
 dpkg-buildpackage -us -uc -b
 ```
 
+# Wiki
+* [MongoDB backup and restore](https://github.com/sb0y/warp_beacon/wiki/MongoDB-backup-and-restore)
+* [Introduction in account.json file](https://github.com/sb0y/warp_beacon/wiki/Introduction-in-account.json-file)
+
 # Support Warp Beacon project
 
 [<img src="https://cdn.cryptocloud.plus/brand/cc-group-black.png" alt="CryptoCloud Accepted" width="250px">](https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E)

{warp_beacon-2.3.0 → warp_beacon-2.3.2}/README.md

@@ -36,12 +36,16 @@ TG_BOT_ADMIN_USERNAME=""
 ###
 INSTAGRAM_LOGIN="instagram login (email or cell phone)"
 INSTAGRAM_PASSWORD="instgram password"
-INSTAGRAM_VERIFICATION_CODE="instagram 2FA if required, default empty"
 MONGODB_HOST="mongodb"
 MONGODB_PORT="27017"
 MONGODB_USER="root"
 MONGODB_PASSWORD="changeme"
-VIDEO_STORAGE_DIR="/var/warp_beacon/videos"
+# more information about accounts.json and proxies.json
+# can be found in project wiki
+# https://github.com/sb0y/warp_beacon/wiki/Introduction-in-account.json-file
+SERVICE_ACCOUNTS_FILE=/var/warp_beacon/accounts.json
+PROXY_FILE=/var/warp_beacon/proxies.json
+
 # workers settings
 # default: min(32, os.cpu_count() + 4)
 #TG_WORKERS_POOL_SIZE=3
@@ -158,6 +162,10 @@ build deb file
 dpkg-buildpackage -us -uc -b
 ```
 
+# Wiki
+* [MongoDB backup and restore](https://github.com/sb0y/warp_beacon/wiki/MongoDB-backup-and-restore)
+* [Introduction in account.json file](https://github.com/sb0y/warp_beacon/wiki/Introduction-in-account.json-file)
+
 # Support Warp Beacon project
 
 [<img src="https://cdn.cryptocloud.plus/brand/cc-group-black.png" alt="CryptoCloud Accepted" width="250px">](https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E)

warp_beacon-2.3.2/warp_beacon/__version__.py

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

{warp_beacon-2.3.0 → warp_beacon-2.3.2}/warp_beacon/scraper/exceptions.py

@@ -11,7 +11,7 @@ class ScraperError(Exception):
 				body=getattr(self, "error_type", vars(self)),
 			)
 		super().__init__(self.message, *args, **kwargs)
-		if hasattr(self, "response") and self.response: 
+		if hasattr(self, "response") and self.response:
 			self.code = self.response.status_code
 
 class TimeOut(ScraperError):

{warp_beacon-2.3.0 → warp_beacon-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.0 → warp_beacon-2.3.2}/warp_beacon/telegram/handlers.py

@@ -175,7 +175,8 @@ class Handlers(object):
 								media_type=JobType.COLLECTION,
 								chat_id=chat.id,
 								chat_type=message.chat.type,
-								source_username=Utils.extract_message_author(message)
+								source_username=Utils.extract_message_author(message),
+								message_leftover=msg_leftover
 							)
 						)
 					elif ent_len:
@@ -203,7 +204,8 @@ class Handlers(object):
 							uniq_id=uniq_id,
 							job_origin=origin,
 							source_username=Utils.extract_message_author(message),
-							chat_type=chat.type
+							chat_type=chat.type,
+							message_leftover=msg_leftover
 						)):
 						self.bot.uploader.set_inprocess(uniq_id)
 

{warp_beacon-2.3.0 → warp_beacon-2.3.2/warp_beacon.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: warp_beacon
-Version: 2.3.0
+Version: 2.3.2
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -277,12 +277,16 @@ TG_BOT_ADMIN_USERNAME=""
 ###
 INSTAGRAM_LOGIN="instagram login (email or cell phone)"
 INSTAGRAM_PASSWORD="instgram password"
-INSTAGRAM_VERIFICATION_CODE="instagram 2FA if required, default empty"
 MONGODB_HOST="mongodb"
 MONGODB_PORT="27017"
 MONGODB_USER="root"
 MONGODB_PASSWORD="changeme"
-VIDEO_STORAGE_DIR="/var/warp_beacon/videos"
+# more information about accounts.json and proxies.json
+# can be found in project wiki
+# https://github.com/sb0y/warp_beacon/wiki/Introduction-in-account.json-file
+SERVICE_ACCOUNTS_FILE=/var/warp_beacon/accounts.json
+PROXY_FILE=/var/warp_beacon/proxies.json
+
 # workers settings
 # default: min(32, os.cpu_count() + 4)
 #TG_WORKERS_POOL_SIZE=3
@@ -399,6 +403,10 @@ build deb file
 dpkg-buildpackage -us -uc -b
 ```
 
+# Wiki
+* [MongoDB backup and restore](https://github.com/sb0y/warp_beacon/wiki/MongoDB-backup-and-restore)
+* [Introduction in account.json file](https://github.com/sb0y/warp_beacon/wiki/Introduction-in-account.json-file)
+
 # Support Warp Beacon project
 
 [<img src="https://cdn.cryptocloud.plus/brand/cc-group-black.png" alt="CryptoCloud Accepted" width="250px">](https://pay.cryptocloud.plus/pos/W5BMtNQt5bJFoW2E)

warp_beacon-2.3.0/warp_beacon/__version__.py

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