add price min max filters

datawhores · Dec 17, 2023 · 66c9a4c · 66c9a4c
1 parent fefe083
commit 66c9a4c
Show file tree

Hide file tree

Showing 6 changed files with 281 additions and 31 deletions.
diff --git a/ofscraper/filters/models/date.py b/ofscraper/filters/models/date.py
@@ -0,0 +1,70 @@
+"""
+date filters
+"""
+
+import logging
+
+import arrow
+
+import ofscraper.utils.args as args_
+
+
+def dateFilters(filterusername):
+    log = logging.getLogger("shared")
+
+    log.debug(f"Last Seen After Filter: {args_.getargs().last_seen_after}")
+    if args_.getargs().last_seen_after:
+        filterusername = list(
+            filter(
+                lambda x: x.final_last_seen >= args_.getargs().last_seen_after,
+                filterusername,
+            )
+        )
+        log.debug(f"last seen after username count: {len(filterusername)}")
+    log.debug(f"Last Seen Before Filter: {args_.getargs().last_seen_before}")
+    if args_.getargs().last_seen_before:
+        filterusername = list(
+            filter(
+                lambda x: x.final_last_seen <= args_.getargs().last_seen_before,
+                filterusername,
+            )
+        )
+        log.debug(f"last seen before username count: {len(filterusername)}")
+
+    log.debug(f"Subscribed After Filter: {args_.getargs().subscribed_after}")
+    if args_.getargs().subscribed_after:
+        filterusername = list(
+            filter(
+                lambda x: arrow.get(x.subscribed) >= args_.getargs().subscribed_after,
+                filterusername,
+            )
+        )
+        log.debug(f"subscribed after username count: {len(filterusername)}")
+    log.debug(f"Subscribed Before Filter: {args_.getargs().subscribed_before}")
+    if args_.getargs().subscribed_before:
+        filterusername = list(
+            filter(
+                lambda x: x.final_last_seen <= args_.getargs().subscribed_before,
+                filterusername,
+            )
+        )
+        log.debug(f"subscribed before username count: {len(filterusername)}")
+    log.debug(f"Expired After Filter: {args_.getargs().expired_after}")
+    if args_.getargs().expired_after:
+        filterusername = list(
+            filter(
+                lambda x: arrow.get(x.expired) >= args_.getargs().expired_after,
+                filterusername,
+            )
+        )
+        log.debug(f"expired after username count: {len(filterusername)}")
+    log.debug(f"Expired Before Filter: {args_.getargs().expired_before}")
+    if args_.getargs().expired_before:
+        filterusername = list(
+            filter(
+                lambda x: arrow.get(x.expired) <= args_.getargs().expired_before,
+                filterusername,
+            )
+        )
+        log.debug(f"expired before username count: {len(filterusername)}")
+    return filterusername
diff --git a/ofscraper/filters/models/other.py b/ofscraper/filters/models/other.py
@@ -9,25 +9,6 @@
 
 def otherFilters(filterusername):
     log = logging.getLogger("shared")
-
-    log.debug(f"Last Seen After Filter: {args_.getargs().last_seen_after}")
-    if args_.getargs().last_seen_after:
-        filterusername = list(
-            filter(
-                lambda x: x.final_last_seen >= args_.getargs().last_seen_after,
-                filterusername,
-            )
-        )
-        log.debug(f"last seen after username count: {len(filterusername)}")
-    log.debug(f"Last Seen Before Filter: {args_.getargs().last_seen_before}")
-    if args_.getargs().last_seen_before:
-        filterusername = list(
-            filter(
-                lambda x: x.final_last_seen <= args_.getargs().last_seen_before,
-                filterusername,
-            )
-        )
-        log.debug(f"last seen befpre username count: {len(filterusername)}")
     log.debug(f"Excluded usernames: {args_.getargs().excluded_username}")
     if len(args_.getargs().excluded_username) > 0:
         filterusername = list(
@@ -36,5 +17,6 @@ def otherFilters(filterusername):
                 filterusername,
             )
         )
+        log.debug(f"excluded username count: {len(filterusername)}")
 
     return filterusername
diff --git a/ofscraper/filters/models/price.py b/ofscraper/filters/models/price.py
@@ -69,4 +69,86 @@ def pricePaidFreeFilterHelper(filterusername):
             )
         )
         log.debug(f"free promo filter username count: {len(filterusername)}")
+    filterusername = priceMinMaxFilters(filterusername)
+
+    return filterusername
+
+
+def priceMinMaxFilters(filterusername):
+    log = logging.getLogger("shared")
+    log.debug(f"Promo Price min Filter: {args_.getargs().promo_price_min}")
+    if args_.getargs().promo_price_min:
+        filterusername = list(
+            filter(
+                lambda x: x.final_promo_price >= args_.getargs().promo_price_min,
+                filterusername,
+            )
+        )
+        log.debug(f"currently promo min filter: {len(filterusername)}")
+    log.debug(f"Promo Price max Filter: {args_.getargs().promo_price_max}")
+    if args_.getargs().promo_price_max:
+        filterusername = list(
+            filter(
+                lambda x: x.final_promo_price <= args_.getargs().promo_price_max,
+                filterusername,
+            )
+        )
+        log.debug(f"currently promo max filter: {len(filterusername)}")
+
+    log.debug(f"Regular Price min Filter: {args_.getargs().regular_price_min}")
+    if args_.getargs().regular_price_min:
+        filterusername = list(
+            filter(
+                lambda x: x.final_regular_price >= args_.getargs().regular_price_min,
+                filterusername,
+            )
+        )
+        log.debug(f"currently regular min filter: {len(filterusername)}")
+    log.debug(f"Regular Price max Filter: {args_.getargs().regular_price_max}")
+    if args_.getargs().regular_price_max:
+        filterusername = list(
+            filter(
+                lambda x: x.final_regular_price <= args_.getargs().regular_price_max,
+                filterusername,
+            )
+        )
+        log.debug(f"currently regular max filter: {len(filterusername)}")
+
+    log.debug(f"Renewal Price min Filter: {args_.getargs().renewal_price_min}")
+    if args_.getargs().renewal_price_min:
+        filterusername = list(
+            filter(
+                lambda x: x.final_renewal_price >= args_.getargs().renewal_price_min,
+                filterusername,
+            )
+        )
+        log.debug(f"currently renewal min filter: {len(filterusername)}")
+    log.debug(f"Renewal Price max Filter: {args_.getargs().renewal_price_max}")
+    if args_.getargs().renewal_price_max:
+        filterusername = list(
+            filter(
+                lambda x: x.final_renewal_price <= args_.getargs().renewal_price_max,
+                filterusername,
+            )
+        )
+        log.debug(f"currently renewal max filter: {len(filterusername)}")
+
+    log.debug(f"Current Price min Filter: {args_.getargs().current_price_min}")
+    if args_.getargs().current_price_min:
+        filterusername = list(
+            filter(
+                lambda x: x.final_current_price >= args_.getargs().current_price_min,
+                filterusername,
+            )
+        )
+        log.debug(f"currently current min filter: {len(filterusername)}")
+    log.debug(f"Current Price max Filter: {args_.getargs().current_price_max}")
+    if args_.getargs().current_price_max:
+        filterusername = list(
+            filter(
+                lambda x: x.final_current_price <= args_.getargs().current_price_max,
+                filterusername,
+            )
+        )
+        log.debug(f"currently current max filter: {len(filterusername)}")
     return filterusername
diff --git a/ofscraper/filters/models/selector.py b/ofscraper/filters/models/selector.py
@@ -2,6 +2,7 @@
 import time
 
 import ofscraper.constants as constants
+import ofscraper.filters.models.date as date_
 import ofscraper.filters.models.flags as flags
 import ofscraper.filters.models.other as other
 import ofscraper.filters.models.price as price
@@ -89,6 +90,7 @@ def filterNSort(usernames):
         filterusername = subtype.subType(usernames)
         filterusername = price.pricePaidFreeFilterHelper(filterusername)
         filterusername = flags.promoFilterHelper(filterusername)
+        filterusername = date_.dateFilters(filterusername)
         filterusername = other.otherFilters(filterusername)
 
         log.debug(f"final username count with all filters: {len(filterusername)}")

diff --git a/ofscraper/prompts/model_helpers.py b/ofscraper/prompts/model_helpers.py
@@ -54,13 +54,29 @@ def getPriceHelper(x):
         "promo-price",
     }:
         value = re.sub("-", "_", args_.getargs().sort).replace("-", "_")
-    if args_.getargs().promo_price:
+    if (
+        args_.getargs().promo_price
+        or args_.getargs().promo_price_min
+        or args_.getargs().promo_price_max
+    ):
         value2 = "promo_price"
-    elif args_.getargs().regular_price:
+    elif (
+        args_.getargs().regular_price
+        or args_.getargs().regular_price_min
+        or args_.getargs().regular_price_max
+    ):
         value2 = "regular_price"
-    elif args_.getargs().renewal_price:
+    elif (
+        args_.getargs().renewal_price
+        or args_.getargs().renewal_price_min
+        or args_.getargs().renewal_price_max
+    ):
         value2 = "renewal_price"
-    elif args_.getargs().current_price:
+    elif (
+        args_.getargs().current_price
+        or args_.getargs().current_price_min
+        or args_.getargs().current_price_max
+    ):
         value2 = "current_price"
     final_value = value or value2 or "current_price"
     key = f"final_{final_value}"

diff --git a/ofscraper/utils/args.py b/ofscraper/utils/args.py
@@ -280,14 +280,23 @@ def create_parser(input=None):
         choices=["paid", "free"],
     )
 
-    # filters.add_argument(
-    #     "-mcp",
-    #     "--min-current-price",
-    #     help="Filter accounts by the min current price of the account",
-    #     default=None,
-    #     required=False,
-    #     type=int
-    # )
+    filters.add_argument(
+        "-cpn",
+        "--current-price-min",
+        help="Filter accounts where the current regular price matches or falls above the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
+
+    filters.add_argument(
+        "-cpm",
+        "--current-price-max",
+        help="Filter accounts where the current price matches or falls below the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
 
     filters.add_argument(
         "-rp",
@@ -299,6 +308,24 @@ def create_parser(input=None):
         choices=["paid", "free"],
     )
 
+    filters.add_argument(
+        "-rpn",
+        "--renewal-price-min",
+        help="Filter accounts where the renewal regular price matches or falls above the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
+
+    filters.add_argument(
+        "-rpm",
+        "--renewal-price-max",
+        help="Filter accounts where the renewal price matches or falls below the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
+
     filters.add_argument(
         "-pm",
         "--promo",
@@ -328,6 +355,24 @@ def create_parser(input=None):
         choices=["paid", "free"],
     )
 
+    filters.add_argument(
+        "-gpn",
+        "--regular-price-min",
+        help="Filter accounts where the regular price matches or falls above the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
+
+    filters.add_argument(
+        "-gpm",
+        "--regular-price-max",
+        help="Filter accounts where the regular price matches or falls below the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
+
     filters.add_argument(
         "-lsb",
         "--last-seen-before",
@@ -374,6 +419,24 @@ def create_parser(input=None):
         type=str.lower,
         choices=["paid", "free"],
     )
+
+    filters.add_argument(
+        "-ppn",
+        "--promo-price-min",
+        help="Filter accounts where the lowest promo price matches or falls above the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
+
+    filters.add_argument(
+        "-ppm",
+        "--promo-price-max",
+        help="Filter accounts where the lowest promo price matches or falls below the provided value",
+        default=False,
+        required=False,
+        type=int,
+    )
     filters.add_argument(
         "-rw",
         "--renewal",
@@ -383,6 +446,23 @@ def create_parser(input=None):
         type=str.lower,
         choices=["active", "disabled"],
     )
+
+    filters.add_argument(
+        "-ea",
+        "--expired-after",
+        help="Filter Accounts by expiration/renewal being before the given date",
+        default=False,
+        required=False,
+        type=arrow_helper,
+    )
+    filters.add_argument(
+        "-eb",
+        "--expired-before",
+        help="Filter Accounts by expiration/renewal being before the given date",
+        default=False,
+        required=False,
+        type=arrow_helper,
+    )
     filters.add_argument(
         "-mp",
         "--sub-status",
@@ -392,6 +472,24 @@ def create_parser(input=None):
         type=str.lower,
         choices=["active", "expired"],
     )
+
+    filters.add_argument(
+        "-sa",
+        "--subscribed-after",
+        help="Filter Accounts by subscription date being before the given date",
+        default=False,
+        required=False,
+        type=arrow_helper,
+    )
+    filters.add_argument(
+        "-sb",
+        "--subscribed-before",
+        help="Filter Accounts by sub date being before the given date",
+        default=False,
+        required=False,
+        type=arrow_helper,
+    )
+
     filters.add_argument(
         "-ul",
         "--user-list",