-
-
-
diff --git a/express/ui/templates/prices.html b/express/ui/templates/prices.html
deleted file mode 100644
index a233c87..0000000
--- a/express/ui/templates/prices.html
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
-
-
-
-
-
-
- TF2 EXPRESS
- -Currently running: {{ data['running'] }}
- -Last time since price update: {{ data['last_price_update'] }}
-Items in pricelist: {{ data['items'] }}
-
-
-
-
-
-
-
-
diff --git a/express/utils.py b/express/utils.py
index b547722..db8653e 100644
--- a/express/utils.py
+++ b/express/utils.py
@@ -1,79 +1,93 @@
-from math import floor, ceil
+import logging
+import json
-from .settings import allow_craft_hats
+import requests
-def to_refined(scrap: int) -> float:
- return floor(scrap / 9 * 100) / 100
+def get_config() -> dict:
+ config = {}
+ with open("./express/config.json", "r") as f:
+ config = json.loads(f.read())
-def to_scrap(refined: float) -> int:
- return ceil(refined * 9)
+ return config
-def refinedify(value: float) -> float:
- return (
- floor((round(value * 9, 0) * 100) / 9) / 100
- if value > 0
- else ceil((round(value * 9, 0) * 100) / 9) / 100
- )
+def summarize_items(items: list[dict]) -> dict:
+ summary = {}
+ for item in items:
+ item_name = items[item]["market_hash_name"]
-class Item:
- def __init__(self, item: dict):
- self.item = item
- self.name = item["market_hash_name"]
+ if item_name not in summary:
+ summary[item_name] = {"count": 1, "image": items[item]["icon_url"]}
+ else:
+ summary[item_name]["count"] += 1
- def is_tf2(self) -> bool:
- return self.item["appid"] == 440
+ return summary
- def has_tag(self, tag: str) -> bool:
- for i in self.item["tags"]:
- if i["localized_tag_name"] == tag:
- return True
- return False
- def has_name(self, name: str) -> bool:
- return self.name == name
+def summarize_trades(trades: list[dict]) -> list[dict]:
+ summary = []
- def has_description(self, description: str) -> bool:
- if "descriptions" not in self.item:
- return False
+ for trade in trades:
+ their_items_summary = summarize_items(trade.get("their_items", []))
+ our_items_summary = summarize_items(trade.get("our_items", []))
- for i in self.item["descriptions"]:
- if i["value"] == description:
- return True
- return False
+ summary.append(
+ {
+ **trade,
+ "our_summary": our_items_summary,
+ "their_summary": their_items_summary,
+ }
+ )
- def is_craftable(self) -> bool:
- return not self.has_description("( Not Usable in Crafting )")
+ return summary
- def is_halloween(self) -> bool:
- return self.has_description("Holiday Restriction: Halloween / Full Moon")
- def is_craft_hat(self) -> bool:
- return (
- self.is_craftable()
- and not self.is_halloween()
- and self.has_tag("Cosmetic")
- and allow_craft_hats
- )
+def get_version(repository: str, folder: str) -> str:
+ url = f"https://raw.githubusercontent.com/offish/{repository}/master/{folder}/__init__.py"
- def is_key(self) -> bool:
- return self.is_craftable() and self.has_name("Mann Co. Supply Crate Key")
+ r = requests.get(url)
+ data = r.text
- def is_pure(self) -> bool:
- return self.is_craftable() and (
- self.has_name("Refined Metal")
- or self.has_name("Reclaimed Metal")
- or self.has_name("Scrap Metal")
- )
+ version_index = data.index("__version__")
+ start_quotation_mark = data.index('"', version_index)
+ end_quotation_mark = data.index('"', start_quotation_mark + 1)
+
+ # get rid of first "
+ return data[start_quotation_mark + 1 : end_quotation_mark]
+
+
+class ExpressFormatter(logging.Formatter):
+ _format = "tf2-express | %(asctime)s - [%(levelname)s]: %(message)s"
+
+ FORMATS = {
+ logging.DEBUG: _format,
+ logging.INFO: _format,
+ logging.WARNING: _format,
+ logging.ERROR: _format + "(%(filename)s:%(lineno)d)",
+ logging.CRITICAL: _format + "(%(filename)s:%(lineno)d)",
+ }
+
+ def format(self, record):
+ log_fmt = self.FORMATS.get(record.levelno)
+ formatter = logging.Formatter(log_fmt, datefmt="%H:%M:%S")
+ return formatter.format(record)
+
+
+class ExpressFileFormatter(logging.Formatter):
+ _format = "%(filename)s %(asctime)s - [%(levelname)s]: %(message)s"
+
+ FORMATS = {
+ logging.DEBUG: _format,
+ logging.INFO: _format,
+ logging.WARNING: _format,
+ logging.ERROR: _format + "(%(filename)s:%(lineno)d)",
+ logging.CRITICAL: _format + "(%(filename)s:%(lineno)d)",
+ }
- def get_pure(self) -> float:
- if self.has_name("Refined Metal"):
- return 1.00
- elif self.has_name("Reclaimed Metal"):
- return 0.33
- elif self.has_name("Scrap Metal"):
- return 0.11
- return 0.00
+ def format(self, record):
+ log_fmt = self.FORMATS.get(record.levelno)
+ formatter = logging.Formatter(log_fmt, datefmt="%d/%m/%Y %H:%M:%S")
+ return formatter.format(record)
diff --git a/gui.bat b/gui.bat
deleted file mode 100644
index 8350c4b..0000000
--- a/gui.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off
-title tf2-express-gui
-python -m express.ui.panel
-pause
diff --git a/main.py b/main.py
index 5914c89..f3bac81 100644
--- a/main.py
+++ b/main.py
@@ -1,213 +1,123 @@
-from multiprocessing import Process, Pool
-from time import sleep, time
-
-from express.database import *
-from express.settings import *
-from express.logging import Log, f
-from express.prices import update_pricelist
-from express.config import *
-from express.client import Client
-from express.offer import Offer, valuate
-from express.utils import to_refined, refinedify
-
-import socketio
-
-
-def run(bot: dict) -> None:
- try:
- client = Client(bot)
- client.login()
-
- log = Log(bot["name"])
-
- processed = []
- values = {}
-
- log.info(f"Polling offers every {TIMEOUT} seconds")
-
- while True:
- log = Log(bot["name"])
- log.debug("Polling offers...")
- offers = client.get_offers()
-
- for offer in offers:
- offer_id = offer["tradeofferid"]
-
- if offer_id not in processed:
- log = Log(bot["name"], offer_id)
-
- trade = Offer(offer)
- steam_id = trade.get_partner()
-
- if trade.is_active() and not trade.is_our_offer():
- log.trade(f"Received a new offer from {f.YELLOW + steam_id}")
-
- if trade.is_from_owner():
- log.trade("Offer is from owner")
- client.accept(offer_id)
-
- elif trade.is_gift() and accept_donations:
- log.trade("User is trying to give items")
- client.accept(offer_id)
-
- elif trade.is_scam() and decline_scam_offers:
- log.trade("User is trying to take items")
- client.decline(offer_id)
-
- elif trade.is_valid():
- log.trade("Processing offer...")
-
- their_items = offer["items_to_receive"]
- our_items = offer["items_to_give"]
-
- items = get_items()
-
- their_value = valuate(their_items, "buy", items)
- our_value = valuate(our_items, "sell", items)
-
- item_amount = len(their_items) + len(our_items)
- log.trade(f"Offer contains {item_amount} items")
-
- difference = to_refined(their_value - our_value)
- summary = "User value: {} ref, our value: {} ref, difference: {} ref"
-
- log.trade(
- summary.format(
- to_refined(their_value),
- to_refined(our_value),
- refinedify(difference),
- )
- )
-
- if their_value >= our_value:
- values[offer_id] = {
- "our_value": to_refined(our_value),
- "their_value": to_refined(their_value),
- }
- client.accept(offer_id)
-
- else:
- if decline_bad_trade:
- client.decline(offer_id)
- else:
- log.trade(
- "Ignoring offer as automatic decline is disabled"
- )
-
- else:
- log.trade("Offer is invalid")
-
- else:
- log.trade("Offer is not active")
-
- processed.append(offer_id)
-
- del offers
-
- for offer_id in processed:
- offer = client.get_offer(offer_id)
- trade = Offer(offer)
-
- log = Log(bot["name"], offer_id)
-
- if not trade.is_active():
- state = trade.get_state()
- log.trade(f"Offer state changed to {f.YELLOW + state}")
-
- if trade.is_accepted() and "tradeid" in offer:
- if save_trades:
- Log().info("Saving offer data...")
-
- if offer_id in values:
- offer["our_value"] = values[offer_id]["our_value"]
- offer["their_value"] = values[offer_id]["their_value"]
-
- offer["receipt"] = client.get_receipt(offer["tradeid"])
- add_trade(offer)
-
- if offer_id in values:
- values.pop(offer_id)
-
- processed.remove(offer_id)
-
- sleep(TIMEOUT)
-
- except BaseException as e:
- log.info(f"Caught {type(e).__name__}")
-
- try:
- client.logout()
- except:
- pass
-
- log.info(f"Stopped")
-
-
-def database() -> None:
- try:
- items_in_database = get_items()
- log = Log()
-
- while True:
- if not items_in_database == get_items():
- log.info("Item(s) were added or removed from the database")
- items_in_database = get_items()
- update_pricelist(items_in_database)
- log.info("Successfully updated all prices")
- sleep(10)
-
- except BaseException:
- pass
-
-
-if __name__ == "__main__":
- t1 = time()
- log = Log()
-
- try:
- socket = socketio.Client()
-
- items = get_items()
- update_pricelist(items)
- log.info("Successfully updated all prices")
-
- del items
-
- @socket.event
- def connect():
- socket.emit("authentication")
- log.info("Successfully connected to Prices.TF socket server")
-
- @socket.event
- def authenticated(data):
- pass
-
- @socket.event
- def price(data):
- if data["name"] in get_items():
- update_price(data["name"], True, data["buy"], data["sell"])
-
- @socket.event
- def unauthorized(sid):
- pass
-
- socket.connect("https://api.prices.tf")
- log.info("Listening to Prices.TF for price updates")
-
- process = Process(target=database)
- process.start()
-
- with Pool(len(BOTS)) as p:
- p.map(run, BOTS)
-
- except BaseException as e:
- if e:
- log.error(e)
-
- finally:
- socket.disconnect()
- process.terminate()
- t2 = time()
- log.info(f"Done. Bot ran for {round(t2-t1, 1)} seconds")
- log.close()
- quit()
+from express.express import Express
+from express.options import Options, GlobalOptions
+from express.utils import (
+ ExpressFormatter,
+ ExpressFileFormatter,
+ get_version,
+ get_config,
+)
+
+from threading import Thread
+import logging
+import sys
+import os
+
+from tf2_utils import PricesTFSocket
+from tf2_utils import __version__ as tf2_utils_version
+from express import __version__ as tf2_express_version
+from tf2_sku import __version__ as tf2_sku_version
+
+
+bots: list[Express] = []
+
+packages = [
+ (tf2_express_version, "tf2-express", "express"),
+ (tf2_utils_version, "tf2-utils", "src/tf2_utils"),
+ (tf2_sku_version, "tf2-sku", "src/tf2_sku"),
+]
+
+formatter = ExpressFormatter()
+stream_handler = logging.StreamHandler(sys.stdout)
+
+LOG_PATH = os.getcwd() + "/logs/"
+LOG_FILE = LOG_PATH + "express.log"
+
+# create folder and empty log file
+if not os.path.isfile(LOG_FILE):
+ os.makedirs(LOG_PATH)
+ open(LOG_FILE, "x")
+
+file_handler = logging.FileHandler(LOG_FILE, encoding="utf-8")
+
+logging.basicConfig(
+ level=logging.DEBUG,
+ handlers=[
+ stream_handler,
+ file_handler,
+ ],
+)
+
+# only want to see info and above in console
+stream_handler.setLevel(logging.INFO)
+# stream_handler.setLevel(logging.DEBUG)
+stream_handler.setFormatter(ExpressFormatter())
+
+# want to have everything in the log file
+file_handler.setLevel(logging.DEBUG)
+file_handler.setFormatter(ExpressFileFormatter())
+
+
+def create_bot_instance(bot: dict) -> Express:
+ options = Options(**bot["options"])
+ logging.debug(f"using options {options=}")
+ client = Express(bot, options)
+
+ logging.info(f"Created instance for {bot['username']}")
+ return client
+
+
+# callback to tf2-utils' pricestf
+def on_price_change(data: dict) -> None:
+ if data.get("type") != "PRICE_CHANGED":
+ return
+
+ if not data.get("data", {}).get("sku"):
+ return
+
+ logging.debug(f"Got new price change from Prices.tf {data=}")
+
+ for bot in bots:
+ bot.append_new_price(data.get("data", {}))
+
+
+if __name__ == "__main__":
+ logging.info("Started tf2-express")
+
+ config = get_config()
+ options = GlobalOptions(**config)
+
+ prices_tf_socket = PricesTFSocket(on_price_change)
+ prices_thread = Thread(target=prices_tf_socket.listen, daemon=True)
+
+ logging.info("Listening to Prices.tf for price updates")
+
+ if options.check_versions_on_startup:
+ for i in packages:
+ current_version, repo, folder = i
+ latest_version = get_version(repo, folder)
+
+ if current_version == latest_version:
+ continue
+
+ logging.warning(
+ "{} is at version {} while {} is available".format(
+ repo, current_version, latest_version
+ )
+ )
+
+ prices_thread.start()
+ bot_threads: list[Thread] = []
+
+ for bot in options.bots:
+ bot_instance = create_bot_instance(bot)
+ bot_instance.login()
+ bot_thread = Thread(target=bot_instance.run, daemon=True)
+ bot_thread.start()
+
+ bots.append(bot_instance)
+ bot_threads.append(bot_thread)
+
+ for thread in bot_threads:
+ thread.join()
+
+ prices_thread.join()
diff --git a/panel.py b/panel.py
new file mode 100644
index 0000000..ca673ec
--- /dev/null
+++ b/panel.py
@@ -0,0 +1,237 @@
+from express.database import Database
+from express.utils import summarize_trades
+
+import json
+
+from flask import Flask, render_template, request, redirect
+from tf2_utils import SchemaItemsUtils, refinedify
+from tf2_data import COLORS
+from tf2_utils import __version__ as tf2_utils_version
+from tf2_data import __version__ as tf2_data_version
+from tf2_sku import __version__ as tf2_sku_version
+from express import __version__ as tf2_express_version
+
+
+app = Flask(__name__)
+name = ""
+
+databases: dict = {}
+schema_items_utils = SchemaItemsUtils()
+first_database = ""
+
+
+def is_sku(item: str) -> bool:
+ return item.find(";") != -1
+
+
+def sku_to_color(sku: str) -> str:
+ quality = sku.split(";")[1:][0]
+ return COLORS[quality]
+
+
+def items_to_data(items: list, skus: list) -> list:
+ data = []
+
+ for item in items:
+ # check if first char is whitespace
+ if item.find(" ") == 0:
+ item = item[1:]
+
+ sku = item
+
+ if not is_sku(sku):
+ sku = schema_items_utils.name_to_sku(item)
+
+ name = schema_items_utils.sku_to_name(sku)
+
+ if sku in skus:
+ print(f"{sku=} already exists in the database")
+ continue
+
+ if not name:
+ print(f"could not get name for {sku=}, ignoring...")
+ continue
+
+ color = sku_to_color(sku)
+ image = schema_items_utils.sku_to_image_url(sku)
+
+ data.append({"sku": sku, "name": name, "image": image, "color": color})
+
+ return data
+
+
+def add_items_to_database(db, data: list) -> None:
+ for item in data:
+ db.add_price(**item)
+
+ return
+
+
+def get_config() -> dict:
+ config = {}
+
+ with open("./express/config.json", "r") as f:
+ config = json.loads(f.read())
+
+ return config
+
+
+def get_database(request) -> tuple[Database, str]:
+ default = first_database
+ db_name = request.args.get("db", default)
+
+ if not db_name:
+ db_name = default
+
+ return databases[db_name], db_name
+
+
+def render(page: str, db_name: str, **kwargs) -> str:
+ return render_template(
+ f"{page}.html", db_name=db_name, database_names=list(databases.keys()), **kwargs
+ )
+
+
+@app.route("/")
+def overview():
+ _, db_name = get_database(request)
+
+ return render(
+ "home",
+ db_name,
+ name=name,
+ tf2_express_version=tf2_express_version,
+ tf2_utils_version=tf2_utils_version,
+ tf2_data_version=tf2_data_version,
+ tf2_sku_version=tf2_sku_version,
+ )
+
+
+@app.route("/trades")
+def trades():
+ db, db_name = get_database(request)
+
+ start = request.args.get("start", 0)
+ amount = request.args.get("amount", 25)
+
+ if not isinstance(start, int):
+ start = int(start)
+
+ if not isinstance(amount, int):
+ amount = int(amount)
+
+ selected_trades, total_trades, start_index, end_index = db.get_trades(start, amount)
+
+ summarized_trades = summarize_trades(selected_trades)
+
+ return render(
+ "trades",
+ db_name,
+ trades=summarized_trades,
+ total_trades=total_trades,
+ start=start,
+ amount=amount,
+ start_index=start_index,
+ end_index=end_index,
+ )
+
+
+@app.route("/item/PRICES
- -Add multiple items by using commas
- -Item prices will be added and updated when running main.py.
-If the bot does not add its prices on startup you might have written in the wrong - item name. E.g. "Team Captain" instead of "The Team Captain".
-Update pricelist to get all items and newer prices.
- -| Item name | -Autoprice | -Buy keys | -Buy refined | -Sell keys | -Sell refined | -Action | -
|---|---|---|---|---|---|---|
+ {% block contents %}
+ {% endblock %}
+
+
+
+
\ No newline at end of file
diff --git a/templates/home.html b/templates/home.html
new file mode 100644
index 0000000..3d2e7b5
--- /dev/null
+++ b/templates/home.html
@@ -0,0 +1,36 @@
+{% extends "base.html" %}
+
+{% block title %}
+Home
+{% endblock %}
+
+{% block contents %}
+Welcome back, {{ name }}
+ +Useful information
+You are running
+-
+
- tf2-express at v{{ tf2_express_version }} repository +
- tf2-utils at v{{ tf2_utils_version }} repository +
- tf2-data at v{{ tf2_data_version }} repository +
- tf2-sku at v{{ tf2_sku_version }} repository + +
Currently viewing data from "{{ db_name }}" database. If you are running multiple bots, you might want to change the + database you are viewing.
+Other links
+-
+
- Discord +
- GitHub profile +
- Steam profile +
Support me?
+These sort of things takes time to make. Donations are not required, but greatly appericated!
+-
+
- Donate +
{{ item.sku }}
+{{ item.name }}
+{% if item.autoprice %} +Autopriced
+{% else %} +Not autopriced
+{% endif %} +Last updated: {{ item.updated }}
+-
+
- + MarketplaceTF + +
- + PricesTF + +
- + AutobotTF + +
Buy
+Keys: {{ item["buy"]["keys"] }}
+Metal: {{ item["buy"]["metal"] }}
+ +Sell
+Keys: {{ item["sell"]["keys"] }}
+Metal: {{ item["sell"]["metal"] }}
+ +Stock
+In stock: TODO
+Max stock: TODO
+ +{% endblock %} \ No newline at end of file diff --git a/templates/items.html b/templates/items.html new file mode 100644 index 0000000..643ee87 --- /dev/null +++ b/templates/items.html @@ -0,0 +1,81 @@ +{% extends "base.html" %} + +{% block title %} +Items +{% endblock %} + +{% block contents %} +Items
+ + + + +Items which are autopriced will get/update their price when starting the bot.
+ +| Icon | +SKU | +Autopriced | +Buy keys | +Buy refined | +Sell keys | +Sell refined | +Action | +
|---|---|---|---|---|---|---|---|
| + {{ item.sku }} ({{ item.name }}) | +{{ item.autoprice }} | + + +
Trades
+ + + + +Showing {{ start_index }}-{{ end_index }} ({{ end_index - start_index }}) of {{ total_trades }} total trades.+ + + +{% for trade in trades %} +
+
+
+{% endfor %}
+{% endblock %}
\ No newline at end of file
+
Trade #{{ trade.tradeofferid }}
+ {% if trade.message %} +Message: {{ trade.message }}
+ {% endif %} +Created: {{ trade.time_created }}
+Accepted: {{ trade.time_updated }}
+ + {% if trade.our_items %} +Our items ({{ trade.our_items|length }}x)
+Our value: {{ trade.our_value }} refined
+ {% for item in trade.our_summary %} +
+ 
+ {{ trade.our_summary[item].count }}x {{ item }}
+
+ {% endfor %}
+ {% endif %}
+
+ {% if trade.their_items %}
+
+ {{ trade.our_summary[item].count }}x {{ item }}
+ Their items ({{ trade.their_items|length }}x)
+Their value: {{ trade.their_value }} refined
+ {% for item in trade.their_summary %} +
+ 
+ {{ trade.their_summary[item].count }}x {{ item }}
+
+ {% endfor %}
+ {% endif %}
+
+ {{ trade.their_summary[item].count }}x {{ item }}
+