cs2tracker 2.1.15__tar.gz → 2.1.16__tar.gz

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/.gitignore

@@ -4,6 +4,7 @@
 __pycache__
 venv
 venv-test
+venv-wsl
 
 # Python build output
 build

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.15
+Version: 2.1.16
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -49,8 +49,8 @@ Dynamic: license-file
 
 - [Features](#features)
 - [Getting Started](#getting-started)
-  - [Prerequisites](#prerequisites)
   - [Installation](#installation)
+  - [Additional Setup](#additional-setup)
 - [Usage](#usage)
 - [Configuration](#configuration)
 - [Advanced Features](#advanced-features)
@@ -60,7 +60,7 @@ Dynamic: license-file
 ## Features
 
 - ⚡ Rapidly import your Storage Units
-- 🔍 Track prices on Steam, Buff163, Youpin898
+- 🔍 Track prices on Steam, Buff163, CSFloat
 - 📈 View investment price history
 - 🧾 Export/Import history data
 - 📤 Discord notifications on updates
@@ -69,19 +69,15 @@ Dynamic: license-file
 
 ## Getting Started
 
-### Prerequisites
-
-- Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/). (Required on Linux)
-- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
-- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
-
 ### Installation
 
-#### Option 1: Windows Executable
+#### Method 1: Executable
 
-- Simply [download the latest executable](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip) and run it.
+Simply download the program and run it:
+  - [Windows](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip)
+  - [Linux](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-linux.zip)
 
-#### Option 2: Install via Pip
+#### Method 2: Install via Pip
 
 1. Install the program:
 
@@ -94,10 +90,14 @@ Dynamic: license-file
    ```bash
    cs2tracker
    ```
+### Additional Setup
+
+- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
+- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
 
 ## Usage
 
-- Click **Run!** to gather the current market prices of your items and calculate the total amount in USD and EUR.
+- Click **Run!** to gather the current market prices of your items and calculate the total amount in USD and your selected currency.
 - The generated Excel sheet can be saved by right-clicking and then selecting **Save Sheet**.
 - Use **Edit Config** to specify the numbers of items owned in the configuration.
 - Click **Show History** to see a price chart consisting of past calculations.

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/README.md

@@ -21,8 +21,8 @@
 
 - [Features](#features)
 - [Getting Started](#getting-started)
-  - [Prerequisites](#prerequisites)
   - [Installation](#installation)
+  - [Additional Setup](#additional-setup)
 - [Usage](#usage)
 - [Configuration](#configuration)
 - [Advanced Features](#advanced-features)
@@ -32,7 +32,7 @@
 ## Features
 
 - ⚡ Rapidly import your Storage Units
-- 🔍 Track prices on Steam, Buff163, Youpin898
+- 🔍 Track prices on Steam, Buff163, CSFloat
 - 📈 View investment price history
 - 🧾 Export/Import history data
 - 📤 Discord notifications on updates
@@ -41,19 +41,15 @@
 
 ## Getting Started
 
-### Prerequisites
-
-- Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/). (Required on Linux)
-- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
-- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
-
 ### Installation
 
-#### Option 1: Windows Executable
+#### Method 1: Executable
 
-- Simply [download the latest executable](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip) and run it.
+Simply download the program and run it:
+  - [Windows](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip)
+  - [Linux](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-linux.zip)
 
-#### Option 2: Install via Pip
+#### Method 2: Install via Pip
 
 1. Install the program:
 
@@ -66,10 +62,14 @@
    ```bash
    cs2tracker
    ```
+### Additional Setup
+
+- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
+- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
 
 ## Usage
 
-- Click **Run!** to gather the current market prices of your items and calculate the total amount in USD and EUR.
+- Click **Run!** to gather the current market prices of your items and calculate the total amount in USD and your selected currency.
 - The generated Excel sheet can be saved by right-clicking and then selecting **Save Sheet**.
 - Use **Edit Config** to specify the numbers of items owned in the configuration.
 - Click **Show History** to see a price chart consisting of past calculations.

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/cs2tracker/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '2.1.15'
-__version_tuple__ = version_tuple = (2, 1, 15)
+__version__ = version = '2.1.16'
+__version_tuple__ = version_tuple = (2, 1, 16)

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/cs2tracker/constants.py

@@ -18,19 +18,36 @@ except ImportError:
 class OSType(enum.Enum):
     WINDOWS = "Windows"
     LINUX = "Linux"
+    MACOS = "MacOS"
 
 
-OS = OSType.WINDOWS if sys.platform.startswith("win") else OSType.LINUX
-PYTHON_EXECUTABLE = sys.executable
+if sys.platform.startswith("win"):
+    OS = OSType.WINDOWS
+elif sys.platform.startswith("linux"):
+    OS = OSType.LINUX
+elif sys.platform.startswith("darwin"):
+    OS = OSType.MACOS
+else:
+    raise NotImplementedError(f"Unsupported OS: {sys.platform}")
 
 
+PYTHON_EXECUTABLE = sys.executable
 RUNNING_IN_EXE = getattr(sys, "frozen", False) and hasattr(sys, "_MEIPASS")
 
 if RUNNING_IN_EXE:
     MEIPASS_DIR = sys._MEIPASS  # type: ignore  pylint: disable=protected-access
     MODULE_DIR = MEIPASS_DIR
     PROJECT_DIR = MEIPASS_DIR
-    APP_DATA_DIR = os.path.join(os.path.expanduser("~"), "AppData", "Local")
+
+    if OS == OSType.WINDOWS:
+        APP_DATA_DIR = os.path.join(os.path.expanduser("~"), "AppData", "Local")
+    elif OS == OSType.LINUX:
+        APP_DATA_DIR = os.environ.get(
+            "XDG_DATA_HOME", os.path.join(os.path.expanduser("~"), ".local", "share")
+        )
+    else:
+        raise NotImplementedError(f"Unsupported OS: {OS}")
+
     DATA_DIR = os.path.join(APP_DATA_DIR, "cs2tracker", "data")
     os.makedirs(DATA_DIR, exist_ok=True)
 

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/cs2tracker/scraper/background_task.py

@@ -1,5 +1,5 @@
 import os
-from subprocess import DEVNULL, call
+from subprocess import DEVNULL, STDOUT, CalledProcessError, call, check_output, run
 
 from cs2tracker.constants import (
     BATCH_FILE,
@@ -18,6 +18,18 @@ WIN_BACKGROUND_TASK_CMD = (
     f"powershell -WindowStyle Hidden -Command \"Start-Process '{BATCH_FILE}' -WindowStyle Hidden\""
 )
 
+LINUX_BACKGROUND_TASK_SCHEDULE = "0 12 * * *"
+LINUX_BACKGROUND_TASK_CMD = (
+    f"bash -c 'cd {PROJECT_DIR} && {PYTHON_EXECUTABLE} -m cs2tracker --only-scrape'"
+)
+LINUX_BACKGROUND_TASK_CMD_EXE = f"bash -c 'cd {PROJECT_DIR} && {PYTHON_EXECUTABLE} --only-scrape'"
+
+if RUNNING_IN_EXE:
+    LINUX_CRON_JOB = f"{LINUX_BACKGROUND_TASK_SCHEDULE} {LINUX_BACKGROUND_TASK_CMD_EXE}"
+else:
+    LINUX_CRON_JOB = f"{LINUX_BACKGROUND_TASK_SCHEDULE} {LINUX_BACKGROUND_TASK_CMD}"
+
+
 console = get_console()
 
 
@@ -34,8 +46,17 @@ class BackgroundTask:
             return_code = call(cmd, stdout=DEVNULL, stderr=DEVNULL)
             found = return_code == 0
             return found
+        elif OS == OSType.LINUX:
+            try:
+                existing_jobs = (
+                    check_output(["crontab", "-l"], stderr=STDOUT).decode("utf-8").strip()
+                )
+            except CalledProcessError:
+                existing_jobs = ""
+
+            found = LINUX_CRON_JOB in existing_jobs.splitlines()
+            return found
         else:
-            # TODO: implement finder for cron jobs
             return False
 
     @classmethod
@@ -83,17 +104,69 @@ class BackgroundTask:
             ]
             return_code = call(cmd, stdout=DEVNULL, stderr=DEVNULL)
             if return_code == 0:
-                console.print("[bold green][+] Background task enabled.")
+                console.info("Background task enabled.")
             else:
                 console.error("Failed to enable background task.")
         else:
             cmd = ["schtasks", "/delete", "/tn", WIN_BACKGROUND_TASK_NAME, "/f"]
             return_code = call(cmd, stdout=DEVNULL, stderr=DEVNULL)
             if return_code == 0:
-                console.print("[bold green][-] Background task disabled.")
+                console.info("Background task disabled.")
             else:
                 console.error("Failed to disable background task.")
 
+    @classmethod
+    def _toggle_linux(cls, enabled: bool):
+        """
+        Create or delete a daily background task that runs the scraper on Linux.
+
+        :param enabled: If True, the task will be created; if False, the task will be
+            deleted.
+        """
+        try:
+            existing_jobs = check_output(["crontab", "-l"], stderr=STDOUT).decode("utf-8").strip()
+        except CalledProcessError:
+            existing_jobs = ""
+
+        cron_lines = existing_jobs.splitlines()
+
+        if enabled and LINUX_CRON_JOB not in cron_lines:
+            updated_jobs = (
+                existing_jobs + "\n" + LINUX_CRON_JOB + "\n"
+                if existing_jobs
+                else LINUX_CRON_JOB + "\n"
+            )
+            try:
+                run(
+                    ["crontab", "-"],
+                    input=updated_jobs.encode("utf-8"),
+                    stdout=DEVNULL,
+                    stderr=DEVNULL,
+                    check=True,
+                )
+                console.info("Background task enabled.")
+            except CalledProcessError:
+                console.error("Failed to enable background task.")
+
+        elif not enabled and LINUX_CRON_JOB in cron_lines:
+            updated_jobs = "\n".join(
+                line for line in cron_lines if line.strip() != LINUX_CRON_JOB
+            ).strip()
+            try:
+                if updated_jobs:
+                    run(
+                        ["crontab", "-"],
+                        input=(updated_jobs + "\n").encode("utf-8"),
+                        stdout=DEVNULL,
+                        stderr=DEVNULL,
+                        check=True,
+                    )
+                else:
+                    run(["crontab", "-r"], stdout=DEVNULL, stderr=DEVNULL, check=True)
+                console.info("Background task disabled.")
+            except CalledProcessError:
+                console.error("Failed to disable background task.")
+
     @classmethod
     def toggle(cls, enabled: bool):
         """
@@ -104,6 +177,7 @@ class BackgroundTask:
         """
         if OS == OSType.WINDOWS:
             cls._toggle_windows(enabled)
+        elif OS == OSType.LINUX:
+            cls._toggle_linux(enabled)
         else:
-            # TODO: implement toggle for cron jobs
             pass

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/cs2tracker/scraper/parser.py

@@ -127,7 +127,7 @@ class CSGOTraderParser(BaseParser):
     CSGOTRADER_PRICE_LIST = "https://prices.csgotrader.app/latest/{}.json"
     PRICE_INFO = "Owned: {:<10}  {:<10}: ${:<10}  Total: ${:<10}"
     NEEDS_TIMEOUT = False
-    SOURCES = [PriceSource.STEAM, PriceSource.BUFF163, PriceSource.YOUPIN898]
+    SOURCES = [PriceSource.STEAM, PriceSource.BUFF163, PriceSource.CSFLOAT]
 
     @classmethod
     def get_item_page_url(cls, item_href, source=PriceSource.STEAM):
@@ -176,6 +176,12 @@ class CSGOTraderParser(BaseParser):
                 raise ValueError(
                     f"CSGOTrader: Could not find recent youpin898 price: {url_decoded_name}"
                 )
+        elif source == PriceSource.CSFLOAT:
+            price = price_info.get("price")
+            if not price:
+                raise ValueError(
+                    f"CSGOTrader: Could not find recent csfloat price: {url_decoded_name}"
+                )
         else:
             price = price_info.get("starting_at")
             if not price:

{cs2tracker-2.1.15 → cs2tracker-2.1.16}/cs2tracker.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cs2tracker
-Version: 2.1.15
+Version: 2.1.16
 Summary: Tracking the steam market prices of CS2 items
 Home-page: https://github.com/ashiven/cs2tracker
 Author: Jannik Novak
@@ -49,8 +49,8 @@ Dynamic: license-file
 
 - [Features](#features)
 - [Getting Started](#getting-started)
-  - [Prerequisites](#prerequisites)
   - [Installation](#installation)
+  - [Additional Setup](#additional-setup)
 - [Usage](#usage)
 - [Configuration](#configuration)
 - [Advanced Features](#advanced-features)
@@ -60,7 +60,7 @@ Dynamic: license-file
 ## Features
 
 - ⚡ Rapidly import your Storage Units
-- 🔍 Track prices on Steam, Buff163, Youpin898
+- 🔍 Track prices on Steam, Buff163, CSFloat
 - 📈 View investment price history
 - 🧾 Export/Import history data
 - 📤 Discord notifications on updates
@@ -69,19 +69,15 @@ Dynamic: license-file
 
 ## Getting Started
 
-### Prerequisites
-
-- Download and install the latest versions of [Python](https://www.python.org/downloads/) and [Pip](https://pypi.org/project/pip/). (Required on Linux)
-- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
-- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
-
 ### Installation
 
-#### Option 1: Windows Executable
+#### Method 1: Executable
 
-- Simply [download the latest executable](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip) and run it.
+Simply download the program and run it:
+  - [Windows](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-windows.zip)
+  - [Linux](https://github.com/ashiven/cs2tracker/releases/latest/download/cs2tracker-linux.zip)
 
-#### Option 2: Install via Pip
+#### Method 2: Install via Pip
 
 1. Install the program:
 
@@ -94,10 +90,14 @@ Dynamic: license-file
    ```bash
    cs2tracker
    ```
+### Additional Setup
+
+- Register for the [Crawlbase Smart Proxy API](https://crawlbase.com/) and retrieve your API key. (Optional)
+- Create a [Discord Webhook](https://support.discord.com/hc/en-us/articles/228383668-Intro-to-Webhooks) to be notified about recent price updates. (Optional)
 
 ## Usage
 
-- Click **Run!** to gather the current market prices of your items and calculate the total amount in USD and EUR.
+- Click **Run!** to gather the current market prices of your items and calculate the total amount in USD and your selected currency.
 - The generated Excel sheet can be saved by right-clicking and then selecting **Save Sheet**.
 - Use **Edit Config** to specify the numbers of items owned in the configuration.
 - Click **Show History** to see a price chart consisting of past calculations.