From 07aed161eb4cd637668513859f35396e778f963b Mon Sep 17 00:00:00 2001 From: Jonathan Branan Date: Wed, 5 Oct 2022 12:58:23 -0500 Subject: [PATCH] #34 added tracker data to dragnet --- qprocess.py | 8 ++++---- test_dragnet.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/qprocess.py b/qprocess.py index 78a5697..38cd649 100644 --- a/qprocess.py +++ b/qprocess.py @@ -30,7 +30,7 @@ def tor_processor(self): self.tl.info(f'Submitted ["{canidate["name"][0:20]}..."] for deletion.') else: if self.enable_dragnet: - dragnet(self.cv,self.dragnet_outfile,canidate['state'],canidate['ratio'],canidate["tags"],canidate['added_on'],self.age,self.t.time(),canidate['infohash_v1'],canidate["name"][0:20]) + dragnet(self.cv,self.dragnet_outfile,canidate['state'],canidate['ratio'],canidate["tags"],canidate['added_on'],self.age,self.t.time(),canidate['infohash_v1'],canidate["name"][0:20],canidate['tracker']) self.tl.info(f'["{canidate["name"][0:20]}..."] is orphaned.') self.up_tor_counter += 1 continue @@ -68,9 +68,9 @@ def is_not_protected_tor(setnonprotectedtag, tortags): if setnonprotectedtag in tortags: return True -def dragnet(csv_obj,outfile,state,ratio,tags,added,age,time,thash,tname): - header = ['state','ratio','tags','added','age','time','thash','tname'] - row = [state,ratio,tags,added,age,time,thash,tname] +def dragnet(csv_obj,outfile,state,ratio,tags,added,age,time,thash,tname,trname): + header = ['state','ratio','tags','added','age','time','thash','tname','trname'] + row = [state,ratio,tags,added,age,time,thash,tname,trname] with open(outfile, 'a+', encoding='UTF8', newline='') as f: writer = csv_obj.writer(f) if f.tell() == 0: diff --git a/test_dragnet.py b/test_dragnet.py index d1adb33..82f1405 100644 --- a/test_dragnet.py +++ b/test_dragnet.py @@ -14,7 +14,8 @@ class TestDragnet(unittest.TestCase): time = 123456 thash = 'asfasdf23412adfqwer' tname = 'thisismynamehahahah' - dragnet(self.cv,outfile,state,ratio,tags,added,age,time,thash,tname) + trname = 'https://localhost.stackoverflow.tech/317332f1c125bc9c1b9b14fb8e054908/announce' + dragnet(self.cv,outfile,state,ratio,tags,added,age,time,thash,tname,trname) if __name__ == '__main__': unittest.main() \ No newline at end of file