From 51c847811cb596ef44595a01ee67ca18663f831f Mon Sep 17 00:00:00 2001
From: monosans <hsyqixco@protonmail.com>
Date: Mon, 29 Jan 2024 00:32:31 +0300
Subject: [PATCH] Remove get_sorted method from ProxyStorage

---
 proxy_scraper_checker/output.py  |  2 +-
 proxy_scraper_checker/storage.py | 25 ++-----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

diff --git a/proxy_scraper_checker/output.py b/proxy_scraper_checker/output.py
index 1f95084..9112882 100644
--- a/proxy_scraper_checker/output.py
+++ b/proxy_scraper_checker/output.py
@@ -66,7 +66,7 @@ def save_proxies(*, settings: Settings, storage: ProxyStorage) -> None:
             ) as f:
                 json.dump(proxy_dicts, f, ensure_ascii=False, indent="\t")
     if settings.output_txt:
-        sorted_proxies = storage.get_sorted(key=settings.sorting_key)
+        sorted_proxies = sorted(storage, key=settings.sorting_key)
         grouped_proxies = tuple(
             (k, sorted(v, key=settings.sorting_key))
             for k, v in storage.get_grouped().items()
diff --git a/proxy_scraper_checker/storage.py b/proxy_scraper_checker/storage.py
index 03f65d0..03b3082 100644
--- a/proxy_scraper_checker/storage.py
+++ b/proxy_scraper_checker/storage.py
@@ -2,25 +2,13 @@ from __future__ import annotations
 
 import itertools
 from collections import Counter
-from typing import (
-    TYPE_CHECKING,
-    Callable,
-    Dict,
-    Iterable,
-    Iterator,
-    List,
-    Set,
-    Tuple,
-)
+from typing import Dict, Iterable, Iterator, Set, Tuple
 
 from aiohttp_socks import ProxyType
 
 from . import sort
 from .proxy import Proxy
 
-if TYPE_CHECKING:
-    from _typeshed import SupportsRichComparison
-
 
 class ProxyStorage:
     __slots__ = ("_proxies", "enabled_protocols")
@@ -43,19 +31,10 @@ class ProxyStorage:
             for proto in sort.PROTOCOL_ORDER
             if proto in self.enabled_protocols
         }
-        for (_, proto), v in itertools.groupby(
-            sorted(self._proxies, key=key), key=key
-        ):
+        for (_, proto), v in itertools.groupby(sorted(self, key=key), key=key):
             d[proto] = tuple(v)
         return d
 
-    def get_sorted(
-        self,
-        *,
-        key: Callable[[Proxy], SupportsRichComparison] = sort.protocol_sort_key,
-    ) -> List[Proxy]:
-        return sorted(self._proxies, key=key)
-
     def get_count(self) -> Dict[ProxyType, int]:
         return dict(Counter(proxy.protocol for proxy in self._proxies))