Merge pull request #42 from codingo/progress-bar-dev

Progress bar development

Author: codingo

Interlace/interlace.py

@@ -21,7 +21,7 @@ def main():
 
     output.print_banner()
 
-    pool = Pool(arguments.threads, build_queue(arguments, output), arguments.timeout, output)
+    pool = Pool(arguments.threads, build_queue(arguments, output), arguments.timeout, output, arguments.sober)
     pool.run()
 
 

Interlace/lib/core/__version__.py

@@ -1,2 +1,2 @@
-__version__ = '1.4.0'
+__version__ = '1.5.0'
 

Interlace/lib/core/input.py

@@ -354,6 +354,11 @@ def setup_parser():
                  'stripped out.'
         )
 
+        parser.add_argument(
+            '--no-bar', '--sober', dest='sober', action='store_true', default=True,
+            help='If set then progress bar will be stripped out'
+        )
+
         output_types = parser.add_mutually_exclusive_group()
         output_types.add_argument(
             '-v', '--verbose', dest='verbose', action='store_true', default=False,

Interlace/lib/threader.py

@@ -1,19 +1,23 @@
 import threading
 import subprocess
 import os
+from tqdm import tqdm
 
 
 class Worker(object):
-    def __init__(self, queue, timeout, output):
+    def __init__(self, queue, timeout, output, tqdm):
         self.queue = queue
         self.timeout = timeout
         self.output = output
+        self.tqdm = tqdm
 
     def __call__(self):
         while True:
             try:
                 # get task from queue
                 task = self.queue.pop(0)
+                if self.tqdm:
+                    self.tqdm.update(1)
                 # run task
                 self.run_task(task)
             except IndexError:
@@ -25,7 +29,7 @@ def run_task(task):
 
 
 class Pool(object):
-    def __init__(self, max_workers, queue, timeout, output):
+    def __init__(self, max_workers, queue, timeout, output, progress_bar):
 
         # convert stdin input to integer
         max_workers = int(max_workers)
@@ -43,9 +47,14 @@ def __init__(self, max_workers, queue, timeout, output):
         self.output = output
         self.max_workers = max_workers
 
+        if progress_bar:
+            self.tqdm = tqdm(total=len(queue))
+        else:
+            self.tqdm = False
+
     def run(self):
 
-        workers = [Worker(self.queue, self.timeout, self.output) for w in range(self.max_workers)]
+        workers = [Worker(self.queue, self.timeout, self.output, self.tqdm) for w in range(self.max_workers)]
         threads = []
 
 
@@ -72,5 +81,5 @@ def run(self):
              "sleep 9",
              "sleep 1",
              "echo 'Char!'"]
-    p = Pool(4, tasks, 0, 0)
+    p = Pool(4, tasks, 0, 0, True)
     p.run()

README.md

@@ -32,6 +32,7 @@ Dependencies will then be installed and Interlace will be added to your path as
 | -pL        | Specify a list of proxies                                                                                    |
 | --proto    | Specify protocols that can be used in commands as \_proto\_                                    |
 | -rp        | Specify a real port variable that can be used in commands as \_realport\_                                    |
+| --no-bar / --sober |  If set then progress bar be stripped out                                                             |
 | --no-cidr  | If set then CIDR notation in a target file will not be automatically be expanded into individual hosts       |
 | --no-color | If set then any foreground or background colours will be stripped out                                        |
 | --silent   | If set then only important information will be displayed and banners and other information will be redacted |
@@ -178,5 +179,5 @@ Using the above example, let's assume you want independent scans to be via diffe
 Originally written by Michael Skelton ([codingo](https://twitter.com/codingo_)) and Sajeeb Lohani ([sml555](https://twitter.com/sml555_)) with help from Charelle Collett ([@Charcol0x89](https://twitter.com/Charcol0x89)) for threading refactoring and overall approach, and Luke Stephens ([hakluke](https://twitter.com/hakluke)) for testing and approach.
 
 # Contributions
-Contributions to this project are very welcome. If you're a newcomer to open source and would like some help in doing so, feel free to reach out to me on twitter ([@codingo_](https://twitter.com/codingo_)) and I'll assist wherever I can.
+Contributions to this project are very welcome. If you're a newcomer to open source and would like some help in doing so, feel free to reach out to us on twitter ([@codingo_](https://twitter.com/codingo_)) / ([@sml555_](https://twitter.com/sml555_)) and we'll assist wherever we can.
 

requirements.txt

@@ -1,2 +1,3 @@
 colorclass==2.2.0
-netaddr==0.7.19
+netaddr==0.7.19
+tqdm==4.32.1