warp-beacon 1.0.2__py3-none-any.whl → 1.0.4__py3-none-any.whl

warp_beacon/__version__.py

@@ -1,2 +1,2 @@
-__version__ = "1.0.2"
+__version__ = "1.0.4"
 

warp_beacon/jobs/abstract.py

@@ -49,6 +49,14 @@ class AbstractJob(ABC):
 	def __repr__(self) -> str:
 		return str(self.to_dict())
 
+	def is_empty(self) -> bool:
+		if self.media_type == "collection":
+			if not self.media_collection:
+				return True
+		elif not self.local_media_path:
+			return True
+		return False
+
 	def to_dict(self) -> dict:
 		d = {}
 		for key in dir(self.__class__):

warp_beacon/jobs/download_job.py

@@ -20,4 +20,4 @@ class DownloadJob(AbstractJob):
 		if "media_collection" in d:
 			for k, v in enumerate(d["media_collection"]):
 				d["media_collection"][k] = UploadJob.build(**v)
-		return UploadJob.build(**d)
+		return UploadJob.build(**d)

warp_beacon/jobs/upload_job.py

@@ -23,4 +23,4 @@ class UploadJob(AbstractJob):
 		if key in self.__dict__:
 			self.__dict__[key] = value
 
-		return self
+		return self

warp_beacon/scrapler/__init__.py

@@ -3,7 +3,7 @@ import multiprocessing
 import time
 import logging
 from requests.exceptions import ConnectTimeout, HTTPError
-from instagrapi.exceptions import MediaNotFound, UnknownError
+from instagrapi.exceptions import MediaNotFound, UnknownError, ClientNotFoundError, UserNotFound
 
 from warp_beacon.mediainfo.video import VideoInfo
 from warp_beacon.uploader import AsyncUploader
@@ -70,8 +70,8 @@ class AsyncDownloader(object):
 										logging.error("ConnectTimeout download error!")
 										logging.exception(e)
 										time.sleep(2)
-									except MediaNotFound as e:
-										logging.warning("MediaNotFound occurred!")
+									except (MediaNotFound, ClientNotFoundError, UserNotFound) as e:
+										logging.warning("Not found error occurred!")
 										logging.exception(e)
 										self.uploader.queue_task(job.to_upload_job(
 											job_failed=True,
@@ -118,8 +118,17 @@ class AsyncDownloader(object):
 										else:
 											job_args["local_media_path"] = item["local_media_path"]
 
+										logging.debug("local_media_path: '%s'", job_args.get("local_media_path", ""))
+										logging.debug("media_collection: '%s'", str(job_args.get("media_collection", {})))
 										upload_job = job.to_upload_job(**job_args)
-										self.uploader.queue_task(upload_job)
+										if upload_job.is_empty():
+											logging.info("Upload job is empty. Nothing to do here!")
+											self.uploader.queue_task(job.to_upload_job(
+												job_failed=True,
+												job_failed_msg="Seems like this link doesn't contains any media.")
+											)
+										else:
+											self.uploader.queue_task(upload_job)
 							else:
 								logging.info("Job already in work in parallel worker. Redirecting job to upload worker.")
 								self.uploader.queue_task(job.to_upload_job())

warp_beacon/scrapler/instagram.py

@@ -6,6 +6,7 @@ from typing import Callable, Optional, Union
 
 import requests
 import urllib3
+from urllib.parse import urljoin, urlparse
 import logging
 
 from instagrapi.mixins.story import Story
@@ -51,7 +52,10 @@ class InstagramScrapler(ScraplerAbstract):
 		self.load_session()
 		def _scrap() -> tuple[str]:
 			if "stories" in url:
-				url_last_part = list(filter(None, url.split('/')))[-1]
+				# remove URL options
+				_url = urljoin(url, urlparse(url).path)
+				url_last_part = list(filter(None, _url.split('/')))[-1]
+				logging.debug("url last part: '%s'", url_last_part)
 				if url_last_part.isnumeric():
 					return "story", self.scrap_story(url)
 				else:

{warp_beacon-1.0.2.dist-info → warp_beacon-1.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: warp_beacon
-Version: 1.0.2
+Version: 1.0.4
 Summary: Telegram bot for expanding external media links
 Home-page: https://github.com/sb0y/warp_beacon
 Author: Andrey Bagrintsev
@@ -231,14 +231,14 @@ Requires-Dist: pillow
 Requires-Dist: pymongo
 Requires-Dist: instagrapi ==2.0.0
 
-# warp_beacon [![Upload Python Package](https://github.com/sb0y/warp_beacon/actions/workflows/python-publish.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/python-publish.yml) [![Docker Image CI](https://github.com/sb0y/warp_beacon/actions/workflows/docker-image.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/docker-image.yml) 
+# warp_beacon [![Upload Python Package](https://github.com/sb0y/warp_beacon/actions/workflows/python-publish.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/python-publish.yml) [![Docker Image CI](https://github.com/sb0y/warp_beacon/actions/workflows/docker-image.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/docker-image.yml) [![Build DEB package](https://github.com/sb0y/warp_beacon/actions/workflows/build-deb.yml/badge.svg)](https://github.com/sb0y/warp_beacon/actions/workflows/build-deb.yml)
 
 Telegram bot for external social networks media scrapling.
 Works with links in personal messages and also with group chats.
 
 Just send to bot media link and get video.
 
-All bot configuration stored in [variables.env](https://github.com/sb0y/warp_beacon/blob/main/variables.env) file.
+All bot configuration stored in [warp_beacon.conf](https://github.com/sb0y/warp_beacon/blob/main/etc/warp_beacon.conf) file.
 
 ## Configuration example ##
 
@@ -261,9 +261,21 @@ WORKERS_POOL_SIZE=3
 Any Linux machine will suit in.
 
 Install docker and git
-```
-apt update
-apt install docker-compose git
+```bash
+sudo apt update
+# uninstall old docker packages
+for pkg in docker.io docker-doc docker-compose docker-compose-v2 podman-docker containerd runc; do sudo apt-get remove $pkg; done
+sudo apt install ca-certificates curl git
+sudo install -m 0755 -d /etc/apt/keyrings
+sudo curl -fsSL https://download.docker.com/linux/ubuntu/gpg -o /etc/apt/keyrings/docker.asc
+sudo chmod a+r /etc/apt/keyrings/docker.asc
+# Add the repository to Apt sources:
+echo \
+  "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/ubuntu \
+  $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | \
+  sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+sudo apt update
+sudo apt install docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin git
 ```
 
 Download sources
@@ -277,10 +289,65 @@ cd warp_beacon
 
 Run app
 ```bash
-docker-compose up -d
+sudo docker compose up -d
 ```
 
 Check logs
 ```bash
-docker-compose logs warp_beacon -f
+sudo docker compose logs warp_beacon -f
+```
+
+## How to install from PIP ##
+
+```bash
+sudo apt update
+sudo apt install python3-pip
+sudo pip install warp-beacon
+```
+
+Your configuration file will be located at `/usr/local/lib/python3.10/dist-packages/etc/warp_beacon/warp_beacon.conf`.
+For convenience, we will copy it to a common directory:
+
+```bash
+mkdir /etc/warp_beacon
+cp /usr/local/lib/python3.10/dist-packages/etc/warp_beacon/warp_beacon.conf /etc/warp_beacon/warp_beacon.conf
+```
+
+Run the app
+
+```bash
+source /etc/warp_beacon/warp_beacon.conf && /usr/local/bin/warp_beacon
+```
+
+Most likely you will need a systemd service so that you don't have to start the service manually and don't have to worry about service start on server reboot.
+
+```bash
+cp /usr/local/lib/python3.10/dist-packages/lib/systemd/system/warp_beacon.service /lib/systemd/system
+systemctl unmask warp_beacon.service
+systemctl enable warp_beacon.service
+# start the service app
+systemctl start warp_beacon.service
+```
+
+## How to build Python whl package ##
+```bash
+sudo apt install python3-pip python3-build python3-virtualenv dh-virtualenv
+# If you are getting build errors you probably need the latest version of python3-build
+sudo python3 -m pip install --upgrade build
+python3 -m build
+```
+
+## How to build Ubuntu deb package ##
+
+```bash
+sudo apt update
+sudo apt install debhelper python3-pip python3-build python3-virtualenv dh-virtualenv dh-python
+# If you are getting build errors you probably need the latest version of python3-build
+sudo python3 -m pip install --upgrade build
+```
+
+build deb file
+
+```bash
+dpkg-buildpackage -us -uc -b
 ```

{warp_beacon-1.0.2.dist-info → warp_beacon-1.0.4.dist-info}/RECORD

@@ -1,22 +1,22 @@
 etc/warp_beacon/warp_beacon.conf,sha256=De80YgoU2uZ5-v2s3QX3etAGZ4bZxaBqV0d2xk872RQ,240
 lib/systemd/system/warp_beacon.service,sha256=lPmHqLqcI2eIV7nwHS0qcALQrznixqJuwwPfa2mDLUA,372
 warp_beacon/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/__version__.py,sha256=8LGbZNBoG5xuNYIYHgCEGGM0sb3ykIY8LZgr4orLfPc,23
+warp_beacon/__version__.py,sha256=6wBrqLaWadCfrxfgwwZYsCOPDrwUXxTkLxUFuR0WLPo,23
 warp_beacon/warp_beacon.py,sha256=7vjHQdrwezQOpw_5I_cDsl8WHOEraX72Ft3gTySRZrg,12191
 warp_beacon/jobs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-warp_beacon/jobs/abstract.py,sha256=8WognrL1izF3MiKUfoFaxjn46xzsXfJAK7w9Yj9spBk,1247
-warp_beacon/jobs/download_job.py,sha256=q2ZBc4mNb0vf_e5_PCyPDzFnPJ564Tm218PZysjauHA,735
-warp_beacon/jobs/upload_job.py,sha256=eUBudKV0Z-pqCJ_kdeY_lWMrEqX8Yte5MlEB7Cekvew,739
+warp_beacon/jobs/abstract.py,sha256=LxPRt6ojM6lHXKnZ79H1lMSL9vs9H0yUkN4ZWo4Whjk,1428
+warp_beacon/jobs/download_job.py,sha256=wfZrKUerfYIjWkRxPzfl5gwIlcotIMH7OpTUM9ae8NY,736
+warp_beacon/jobs/upload_job.py,sha256=Vaogc4vbpAfyaT4VkIHEPLFRELmM44TDqkmnPYh3Ymc,740
 warp_beacon/mediainfo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 warp_beacon/mediainfo/video.py,sha256=wYPf1_55PW_x6ifSsgXTKVNbTHU_31IumVpUk1ua5dY,2172
-warp_beacon/scrapler/__init__.py,sha256=-fmjF6F9SyYCR4vHwwYwPTZHD6vPlZmdbLqCeTor1Ms,5547
+warp_beacon/scrapler/__init__.py,sha256=4CKmUOVlQO2_nI47Pa1eQNPGpoqrXSk4JH4EjH-etOk,6099
 warp_beacon/scrapler/abstract.py,sha256=MJxpEovCWDYq2SwbbMsRDfp77WTwvbXXKiQxKWoj0ZQ,304
-warp_beacon/scrapler/instagram.py,sha256=30ewlKdAajRUMdV9EgjW4xJV_p--ev-7qcdNXUpauYM,7079
+warp_beacon/scrapler/instagram.py,sha256=8CF_Zdxn1hStz_PgLxTc0FTt5heI84d-Ks0XzmD7-_o,7248
 warp_beacon/storage/__init__.py,sha256=NhD3V7UNRiZNf61yQEAjXOfi-tfA2LaJa7a7kvbkmtE,2402
 warp_beacon/uploader/__init__.py,sha256=39rXMYel1iqSgpS7QbFU6wk-WKF1f6EL6W3qceNxLhk,3685
-warp_beacon-1.0.2.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-warp_beacon-1.0.2.dist-info/METADATA,sha256=2OEflfim_cJ8SwuSxx2HdbJWZGrlGFkbDiQNPaHfjdM,15664
-warp_beacon-1.0.2.dist-info/WHEEL,sha256=y4mX-SOX4fYIkonsAGA5N0Oy-8_gI4FXw5HNI1xqvWg,91
-warp_beacon-1.0.2.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
-warp_beacon-1.0.2.dist-info/top_level.txt,sha256=VZcz1AU0_EdW3t-74hnT1eazFqSyWgGdF5divvARwmM,334
-warp_beacon-1.0.2.dist-info/RECORD,,
+warp_beacon-1.0.4.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+warp_beacon-1.0.4.dist-info/METADATA,sha256=6oR7v-3jpNm3zZ30DKvshv01MgaNKCZXBRh5J0tl_9o,18201
+warp_beacon-1.0.4.dist-info/WHEEL,sha256=Z4pYXqR_rTB7OWNDYFOm1qRk0RX6GFP2o8LgvP453Hk,91
+warp_beacon-1.0.4.dist-info/entry_points.txt,sha256=eSB61Rb89d56WY0O-vEIQwkn18J-4CMrJcLA_R_8h3g,119
+warp_beacon-1.0.4.dist-info/top_level.txt,sha256=VZcz1AU0_EdW3t-74hnT1eazFqSyWgGdF5divvARwmM,334
+warp_beacon-1.0.4.dist-info/RECORD,,

{warp_beacon-1.0.2.dist-info → warp_beacon-1.0.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (70.2.0)
+Generator: setuptools (70.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any