Added --format option that you can use in order to tell the ProxyEater what format you want your proxies in the text output file to have. E.g: {ip}:{port}

MPCodeWriter21 · MPCodeWriter21 · commit ea09958f4373 · 2022-07-26T13:40:16.000+04:30
diff --git a/ProxyEater/Proxy.py b/ProxyEater/Proxy.py
@@ -59,6 +59,8 @@ class Proxy:
     def __init__(self, ip: str, port: int, type_: ProxyType) -> None:
         self.ip: str = ip
         self.port: int = port
+        if isinstance(type_, str):
+            type_ = ProxyType.from_name(type_)
         self.type: ProxyType = type_
 
     def check_status(self, timeout: int = 10, url: str = 'http://icanhazip.com/', on_success_callback: _Callable = None,
@@ -179,9 +181,20 @@ def __dict__(self) -> dict:
             'port': self.port,
             'type': self.type.name,
             'status': self.status.name,
+            'scheme': self.type.name.lower(),
             'geolocation_info': self.geolocation_info
         }
 
+    def __iter__(self):
+        return iter((
+            ('ip', self.ip),
+            ('port', self.port),
+            ('type', self.type.name),
+            ('status', self.status.name),
+            ('scheme', self.type.name.lower()),
+            ('geolocation_info', self.geolocation_info)
+        ))
+
 
 class ProxyList(set):
     def __init__(self, proxies: _Iterable[Proxy] = None):
@@ -256,38 +269,50 @@ def check_proxy(proxy_: Proxy):
 
         on_progress_callback(self, 100)
 
-    def to_text(self, separator: str = "\n") -> str:
+    def to_text(self, separator: str = "\n", format_: str = '{scheme}://{ip}:{port}') -> str:
         """
         This method is used to convert the list to a text string.
+
+        :param separator: The separator between proxies.
+        :param format_: The format of each proxy.
+        :return: The text string.
         """
-        return separator.join(str(proxy) for proxy in self)
+        return separator.join(format_.format(**dict(proxy)) for proxy in self)
 
     def batch_collect_geolocations(self, fields: str = 'status,message,continent,continentCode,country,countryCode,'
                                                        'region,regionName,city,zip,lat,lon,timezone,isp,org,as,asname,'
-                                                       'query', on_progress_callback: _Callable = None):
+                                                       'query', on_progress_callback: _Callable = None,
+                                   on_error_callback: _Callable = None) -> None:
         """
         This method is used to collect the geolocation of all proxies in the list.
 
         :param fields: The fields to be returned.
         :param on_progress_callback: A callback function to be called on each progress.
+        :param on_error_callback: A callback function to be called on each error.
         """
         if on_progress_callback is not None:
             if not callable(on_progress_callback):
-                raise TypeError(
-                    "ProxyList.batch_collect_geolocations() argument on_progress_callback must be a callable.")
+                raise TypeError("ProxyList.batch_collect_geolocations() argument on_progress_callback must be a"
+                                " callable.")
         else:
             on_progress_callback = lambda proxy_list, progress: None
+        if on_error_callback is not None:
+            if not callable(on_error_callback):
+                raise TypeError("ProxyList.batch_collect_geolocations() argument on_error_callback must be a callable.")
+        else:
+            on_error_callback = lambda proxy_list, error: None
         all_proxies = list(self)
         for start_index in range(0, len(self), 100):
-            end_index = start_index + 100
+            end_index = start_index + 100 if start_index + 100 < len(self) else len(self)
             proxies = all_proxies[start_index:end_index]
             try:
-                response = requests.post(url=f"http://ip-api.com/batch?fields={fields}", data=proxies)
+                response = requests.post(url=f"http://ip-api.com/batch?fields={fields}",
+                                         json=[proxy.ip for proxy in proxies]).json()
                 for index, proxy in enumerate(proxies):
-                    proxy.geolocation_info = response.json()[index]
+                    proxy.geolocation_info = response[index]
+                on_progress_callback(self, end_index / len(self) * 100)
             except Exception as e:
-                raise Exception("Failed to collect geolocation information.", e)
-            on_progress_callback(self, (end_index + 1) / len(self) * 100)
+                on_error_callback(self, Exception("Failed to collect geolocation information.", e))
 
     def to_json(self, indent: int = 4, include_status: bool = True, include_geolocation: bool = True) -> str:
         """
@@ -315,15 +340,17 @@ def to_json(self, indent: int = 4, include_status: bool = True, include_geolocat
 
         return json.dumps(proxies, indent=indent)
 
-    def to_text_file(self, filename: _Union[str, os.PathLike], separator: str = "\n") -> None:
+    def to_text_file(self, filename: _Union[str, os.PathLike], separator: str = "\n",
+                     format_: str = '{scheme}://{ip}:{port}') -> None:
         """
         This method is used to write the list to a text file.
 
         :param filename: The name of the text file.
         :param separator: The separator of the text file.
+        :param format_: The format of each proxy.
         """
         with open(filename, 'w') as f:
-            f.write(self.to_text(separator))
+            f.write(self.to_text(separator, format_))
 
     def to_json_file(self, filename: _Union[str, os.PathLike], indent: int = 4, include_status: bool = True,
                      include_geolocation: bool = True) -> None:
diff --git a/ProxyEater/__init__.py b/ProxyEater/__init__.py
@@ -1,7 +1,7 @@
 # ProxyEater
 # CodeWriter21
 
-__version__ = "1.4.5"
+__version__ = "1.5.0"
 __author__ = "CodeWriter21"
 __email__ = "CodeWriter21@gmail.com"
 __license__ = "Apache-2.0"
diff --git a/ProxyEater/__main__.py b/ProxyEater/__main__.py
@@ -102,15 +102,28 @@ def checking_callback(proxy_list: ProxyList, progress: float):
         logger.info(f'Scraped {len(proxies)} proxies.')
 
         if proxies.count > 0:
+            if args.include_geolocation:
+                on_progress_callback = on_error_callback = None
+                if args.verbose:
+                    logger.progress_bar = log21.ProgressBar()
+
+                    def on_progress_callback(proxy_list: ProxyList, progress: float):
+                        logger.progress_bar(progress, 100)
+
+                    def on_error_callback(proxy_list: ProxyList, error: Exception):
+                        logger.error(f'{error.__class__.__name__}: {error}')
+                logger.info('Getting the geolocation info of the proxies...')
+                proxies.batch_collect_geolocations(on_progress_callback=on_progress_callback,
+                                                   on_error_callback=on_error_callback)
             if args.verbose:
                 logger.info(f'Writing {proxies.count} proxies to {args.output}...')
             # Write to file
-            if args.format == 'text':
-                proxies.to_text_file(args.output, '\n')
-            elif args.format == 'json':
+            if args.file_format == 'text':
+                proxies.to_text_file(args.output, '\n', format_=args.format)
+            elif args.file_format == 'json':
                 proxies.to_json_file(args.output, include_status=args.include_status,
                                      include_geolocation=args.include_geolocation)
-            elif args.format == 'csv':
+            elif args.file_format == 'csv':
                 proxies.to_csv_file(args.output, include_status=args.include_status,
                                     include_geolocation=args.include_geolocation)
     if proxies.count > 0:
@@ -159,13 +172,26 @@ def checking_callback(proxy_list: ProxyList, progress: float):
     logger.info(f'Alive proxies: {proxies.count}')
 
     if proxies.count > 0:
+        if args.include_geolocation:
+            on_progress_callback = on_error_callback = None
+            if args.verbose:
+                logger.progress_bar = log21.ProgressBar()
+
+                def on_progress_callback(proxy_list: ProxyList, progress: float):
+                    logger.progress_bar(progress, 100)
+
+                def on_error_callback(proxy_list: ProxyList, error: Exception):
+                    logger.error(f'{error.__class__.__name__}: {error}')
+            logger.info('Getting the geolocation info of the proxies...')
+            proxies.batch_collect_geolocations(on_progress_callback=on_progress_callback,
+                                               on_error_callback=on_error_callback)
         # Write to file
-        if args.format == 'text':
-            proxies.to_text_file(args.output, '\n')
-        elif args.format == 'json':
+        if args.file_format == 'text':
+            proxies.to_text_file(args.output, '\n', format_=args.format)
+        elif args.file_format == 'json':
             proxies.to_json_file(args.output, include_status=args.include_status,
                                  include_geolocation=args.include_geolocation)
-        elif args.format == 'csv':
+        elif args.file_format == 'csv':
             proxies.to_csv_file(args.output, include_status=args.include_status,
                                 include_geolocation=args.include_geolocation)
         logger.info(f'Wrote {proxies.count} proxies to {args.output}.')
@@ -177,8 +203,12 @@ def main():
         parser.add_argument('mode', help='Modes: Scrape, Check')
         parser.add_argument('--source', '-s', help=f'The source of the proxies(default:{path / "sources.json"}).')
         parser.add_argument('--output', '-o', help=f'The output file.')
-        parser.add_argument('--format', '-f', help=f'The format of the output file(default:text).', default='text',
+        parser.add_argument('--file-format', '-ff', help=f'The format of the output file(default:text).',
+                            default='text',
                             choices=['text', 'json', 'csv'])
+        parser.add_argument('--format', '-f', help='The format for saving the proxies in text file(default:'
+                                                   '"{scheme}://{ip}:{port}").',
+                            default='{scheme}://{ip}:{port}')
         parser.add_argument('--include-status', '-is', help=f'Include the status of the proxies in the output file.',
                             action='store_true')
         parser.add_argument('--threads', '-t', help=f'The number of threads to use for scraping(default:25).', type=int,
@@ -228,26 +258,21 @@ def main():
         if args.output:
             args.output = pathlib.Path(args.output)
         else:
-            if args.format == 'text':
+            if args.file_format == 'text':
                 ext = 'txt'
-            elif args.format == 'json':
+            elif args.file_format == 'json':
                 ext = 'json'
-            elif args.format == 'csv':
+            elif args.file_format == 'csv':
                 ext = 'csv'
             else:
-                parser.error(f'The format {args.format} is not supported.')
+                parser.error(f'The format {args.file_format} is not supported.')
                 return
             args.output = pathlib.Path('.') / ('proxies.' + ext)
             i = 2
             while args.output.exists():
                 args.output = pathlib.Path('.') / f'proxies-{i}.{ext}'
                 i += 1
 
-        # Output Format
-        if args.format == 'text' and (args.include_status or args.include_geolocation):
-            parser.error(f'The format {args.format} does not support the include-status or include-geolocation.')
-            return
-
         args.mode = args.mode.lower()
         if args.mode == 'scrape':
             scrape(args)
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-ProxyEater\[1.4.5\]
+ProxyEater\[1.5.0\]
 ===================
 
 ![version](https://img.shields.io/pypi/v/ProxyEater)
@@ -34,11 +34,12 @@ Usage
 -----
 
 ```
-usage: ProxyEater [-h] [--source SOURCE] [--output OUTPUT] [--format { text, json, csv }]
-                  [--threads THREADS] [--include-status] [--verbose] [--quiet] [--version]
-                  [--timeout TIMEOUT] [--proxy PROXY] [--proxy-type PROXY_TYPE] [--useragent
-                  USERAGENT] [--include-geolocation] [--source-format { text, json, csv }]
-                  [--default-type { http, https, socks4, socks5 }]
+usage: ProxyEater [-h] [--source SOURCE] [--output OUTPUT] [--file-format { text, json, csv }]
+                  [--format FORMAT] [--include-status] [--threads THREADS] [--timeout TIMEOUT]
+                  [--url URL] [--verbose] [--quiet] [--version] [--proxy PROXY] [--proxy-type
+                  PROXY_TYPE] [--useragent USERAGENT] [--include-geolocation] [--no-check]
+                  [--source-format { text, json, csv }] [--default-type { http, https, socks4,
+                  socks5 }]
                   mode
 
 positional arguments:
@@ -48,23 +49,29 @@ options:
   -h, --help
                         show this help message and exit
   --source SOURCE, -s SOURCE
-                        The source of the proxies(default:*\Python\Python310\lib\site-packages\ProxyEater\sources.json).
+                        The source of the proxies(default:C:\Users\Morteza\AppData\Local\Programs\
+                        Python\Python310\lib\site-packages\ProxyEater\sources.json).
   --output OUTPUT, -o OUTPUT
                         The output file.
-  --format { text, json, csv }, -f { text, json, csv }
+  --file-format { text, json, csv }, -ff { text, json, csv }
                         The format of the output file(default:text).
-  --threads THREADS, -t THREADS
-                        The number of threads to use for scraping(default:25).
+  --format FORMAT, -f FORMAT
+                        The format for saving the proxies in text
+                        file(default:"{scheme}://{ip}:{port}").
   --include-status, -is
                         Include the status of the proxies in the output file.
+  --threads THREADS, -t THREADS
+                        The number of threads to use for scraping(default:25).
+  --timeout TIMEOUT, -to TIMEOUT
+                        The timeout of the requests(default:15).
+  --url URL, -u URL
+                        The url to use for checking the proxies(default:http://icanhazip.com).
   --verbose, -v
                         The verbose of the program(default:False).
   --quiet, -q
                         The quiet of the program(default:False).
   --version, -V
                         The version of the program.
-  --timeout TIMEOUT, -to TIMEOUT
-                        The timeout of the requests(default:15).
 
 Scrape:
   Scrape mode arguments
@@ -77,6 +84,8 @@ Scrape:
                         The useragent of the requests(default:random).
   --include-geolocation, -ig
                         Include the geolocation info of the proxies in the output file.
+  --no-check, -nc
+                        Use this option to skip the checking of the proxies after
 
 Check:
   Check mode arguments
diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 
 setup(
     name='ProxyEater',
-    version='1.4.5',
+    version='1.5.0',
     author='CodeWriter21',
     author_email='CodeWriter21@gmail.com',
     description='A Python Proxy Scraper for gathering fresh proxies.',
