.drone.yml

@@ -17,6 +17,7 @@ steps:
       - main
     event:
       - push
+      - pull_request
 - name: docker-test
   image: plugins/docker
   settings:
@@ -33,6 +34,7 @@ steps:
       - dev*
     event:
       - push
+      - pull_request
 - name: test-main
   image: git.jonb.io/jblu/qbit-maid:latest
   commands:
@@ -43,6 +45,7 @@ steps:
       - main
     event:
       - push
+      - pull_request
 - name: test-dev
   image: git.jonb.io/jblu/qbit-maid:dev
   commands:
@@ -53,3 +56,4 @@ steps:
       - dev*
     event:
       - push
+      - pull_request

README.md

@@ -2,7 +2,7 @@
 # qbit-maid
 > Warning: This application removes torrents that are over the minimum age and that are not part of the ignored categories, domains or tags. Please use the delete_torrents feature set to false when first testing its functionality.
 
-[![Build Status](https://drone.jonb.io/api/badges/jblu/qbit-maid/status.svg?ref=refs/heads/main)](https://drone.jonb.io/jblu/qbit-maid)
+![](https://drone.jbranan.com/api/badges/jblu/phc/status.svg)
 
 The objective is to remove torrents based on the following criteria:
 - tracker domain name
@@ -13,15 +13,15 @@ The objective is to remove torrents based on the following criteria:
 ## Install
 ### Docker(Recommended)
 
-[package](https://git.jonb.io/jblu/-/packages/container/qbit-maid/latest)
+[package ](https://git.jbranan.com/jblu/-/packages/container/qbit-maid/latest)
 
-    docker pull git.jonb.io/jblu/qbit-maid:latest
+    docker pull git.jbranan.com/jblu/qbit-maid:latest
 
 #### Docker Run Command:
 
 > Please note it is best practice to escape spaces in variables. That is why there is backslashes in the cron schedule.
 
-    docker run --name qbit-maid -v /opt/qbit-maid:/config/ -e CRON=0\ 1\ *\ *\ * -e toml_path=/config/config.toml git.jonb.io/jblu/qbit-maid
+    docker run --name qbit-maid -v /opt/qbit-maid:/config/ -e CRON=0\ 1\ *\ *\ * -e toml_path=/config/config.toml git.jbranan.com/jblu/qbit-maid
 
 #### Docker Compose
 
@@ -29,7 +29,7 @@ The objective is to remove torrents based on the following criteria:
 version: '3.3'
 services:
     qbit-maid:
-        image: git.jonb.io/jblu/qbit-maid
+        image: git.jbranan.com/jblu/qbit-maid
         container_name: qbit-maid
         volumes:
             - /opt/qbit-maid:/config
@@ -38,7 +38,7 @@ services:
             - toml_path=/config/config.toml
 ```
 ### Via Git
-    git clone https://git.jonb.io/jblu/qbit-maid.git
+    git clone https://git.jbranan.com/jblu/qbit-maid.git
 
 Qbit-maid will look for an environment variable *toml_path* for its configuration.If it doesn't find it, it will look for a config.toml file in it's own directory.
 ##### config.toml

qbit-maid.py

@@ -94,11 +94,6 @@ class Qbt:
         tor_log(self)
         tor_notify(self)
         self.t = time
-
-        #start healthcheck job
-        if self.use_healthcheck:
-            send_ping(self, r, self.healthcheck_url.rstrip("/") + "/start" )
-            
         # Pulling domain names to treat carefully
         self.tracker_list = []
         self.up_tor_counter = 0

qlogging.py

@@ -88,7 +88,7 @@ def get_script_runtime(self):
 
 def send_ping(self, req_obj, healthcheck_url):
     try:
-        req_obj.get(healthcheck_url, timeout=5)
+        req_obj.get(healthcheck_url, timeout=10)
     except req_obj.RequestException as e:
         self.tl.info(f"Ping failed: {e}")
 

test_qbitmaid.py

@@ -1,8 +1,6 @@
 import unittest
-import requests as r
 from qlist import is_preme,is_cat_ignored,is_tracker_blank,is_protected_tracker,is_not_protected_tracker,is_tag_blank,is_ignored_tag
 from qprocess import is_downloading,is_protected_under_ratio,is_old_tor,is_protected_over_ratio,is_not_protected_tor
-from qlogging import send_ping
 
 class TestQbitmaid(unittest.TestCase):
     def test_ispreme_sanity(self):
@@ -96,17 +94,6 @@ class TestQbitmaid(unittest.TestCase):
     def test_isignoredtag(self):
         self.assertTrue(is_ignored_tag(['save'], 'save,public,ipt'))
 
-    def test_sendpingstart_sanity(self):
-        send_ping(self, r, "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb" + "/start")
-        url = "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb"
-        send_ping(self, r, url)
-
-    def test_sendping_start(self):
-        url = "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb/"
-        send_ping(self, r, url.strip("/") + "/start")
-        send_ping(self, r, "https://thunder.jonb.io/ping/921625e5-5b76-4f45-a0c3-56145e16f3bb")
-        
-
     # def test__sanity(self):
     #     pass