Skip to content

Commit a5170f3

Browse files
tslashdtslashd
committed
point calc finished (not reworked yet)
1 parent 3751121 commit a5170f3

2 files changed

Lines changed: 41 additions & 27 deletions

File tree

‎surftimer/ck_playerrank.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,6 @@ async def selectPlayerRankUnknown(
16071607
return xquery
16081608

16091609

1610-
16111610
@router.get(
16121611
"/surftimer/selectPlayerRankUnknown",
16131612
name="Unknown Player Info - TO BE MERGED",
@@ -1649,4 +1648,3 @@ async def selectPlayerRankUnknown(
16491648
set_cache(cache_key, xquery)
16501649

16511650
return xquery
1652-

‎surftimer/queries.py‎

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161
## ck_playerrank
6262
sql_createPlayerRank = "CREATE TABLE IF NOT EXISTS `ck_playerrank` (`steamid` varchar(32) NOT NULL DEFAULT '', `steamid64` varchar(64) DEFAULT NULL, `name` varchar(64) DEFAULT NULL, `country` varchar(32) DEFAULT NULL, `countryCode` varchar(3) DEFAULT NULL, `continentCode` varchar(3) DEFAULT NULL, `points` int(12) DEFAULT '0', `wrpoints` int(12) NOT NULL DEFAULT '0', `wrbpoints` int(12) NOT NULL DEFAULT '0', `wrcppoints` int(11) NOT NULL DEFAULT '0', `top10points` int(12) NOT NULL DEFAULT '0', `groupspoints` int(12) NOT NULL DEFAULT '0', `mappoints` int(11) NOT NULL DEFAULT '0', `bonuspoints` int(12) NOT NULL DEFAULT '0', `finishedmaps` int(12) DEFAULT '0', `finishedmapspro` int(12) DEFAULT '0', `finishedbonuses` int(12) NOT NULL DEFAULT '0', `finishedstages` int(12) NOT NULL DEFAULT '0', `wrs` int(12) NOT NULL DEFAULT '0', `wrbs` int(12) NOT NULL DEFAULT '0', `wrcps` int(12) NOT NULL DEFAULT '0', `top10s` int(12) NOT NULL DEFAULT '0', `groups` int(12) NOT NULL DEFAULT '0', `lastseen` int(64) DEFAULT NULL, `joined` int(64) NOT NULL, `timealive` int(64) NOT NULL DEFAULT '0', `timespec` int(64) NOT NULL DEFAULT '0', `connections` int(64) NOT NULL DEFAULT '1', `readchangelog` int(11) NOT NULL DEFAULT '0', `style` int(11) NOT NULL DEFAULT '0', PRIMARY KEY (`steamid`, `style`)) DEFAULT CHARSET=utf8mb4;"
6363
sql_insertPlayerRank = "INSERT INTO ck_playerrank (steamid, steamid64, name, country, countryCode, continentCode, joined, style) VALUES('{}', '{}', '{}', '{}', '{}', '{}', {}, {})"
64-
sql_updatePlayerRankPoints = "UPDATE ck_playerrank SET name ='{}', points ='{}', wrpoints = {}, wrbpoints = {}, wrcppoints = {}, top10points = {}, groupspoints = {}, mappoints = {}, bonuspoints = {}, finishedmapspro='{}', finishedbonuses = {}, finishedstages = {}, wrs = {}, wrbs = {}, wrcps = {}, top10s = {}, `groups` = {} where steamid='{}' AND style = {};"
65-
sql_updatePlayerRankPoints2 = "UPDATE ck_playerrank SET name ='{}', points ='{}', wrpoints = {}, wrbpoints = {}, wrcppoints = {}, top10points = {}, groupspoints = {}, mappoints = {}, bonuspoints = {}, finishedmapspro='{}', finishedbonuses = {}, finishedstages = {}, wrs = {}, wrbs = {}, wrcps = {}, top10s = {}, `groups` = {}, country = '{}', countryCode = '{}', continentCode = '{}' where steamid='{}' AND style = {};"
64+
sql_updatePlayerRankPoints = "UPDATE ck_playerrank SET name ='{}', points ={}, wrpoints = {}, wrbpoints = {}, wrcppoints = {}, top10points = {}, groupspoints = {}, mappoints = {}, bonuspoints = {}, finishedmapspro={}, finishedbonuses = {}, finishedstages = {}, wrs = {}, wrbs = {}, wrcps = {}, top10s = {}, `groups` = {} where steamid='{}' AND style = {};"
65+
sql_updatePlayerRankPoints2 = "UPDATE ck_playerrank SET name ='{}', points ={}, wrpoints = {}, wrbpoints = {}, wrcppoints = {}, top10points = {}, groupspoints = {}, mappoints = {}, bonuspoints = {}, finishedmapspro={}, finishedbonuses = {}, finishedstages = {}, wrs = {}, wrbs = {}, wrcps = {}, top10s = {}, `groups` = {}, country = '{}', countryCode = '{}', continentCode = '{}' where steamid='{}' AND style = {};"
6666
sql_updatePlayerRank = "UPDATE ck_playerrank SET finishedmaps ='{}', finishedmapspro='{}' where steamid='{}' AND style = '{}';"
6767
sql_selectPlayerName = "SELECT name FROM ck_playerrank where steamid = '{}'"
6868
sql_UpdateLastSeenMySQL = (
@@ -222,29 +222,45 @@
222222
# # ck_playerrank
223223
sql_stray_deleteWipePlayerRank = "DELETE FROM ck_playerrank WHERE steamid = '{}';"
224224
sql_stray_point_calc_playerRankName = "SELECT name FROM ck_playerrank WHERE steamid = '{}' AND style = {};" # duplicate of sql_selectPlayerName
225-
sql_stray_playerRankByName = "SELECT steamid FROM ck_playerrank WHERE style = {} AND name LIKE '%{}%' LIMIT 1;"
226-
sql_stray_cleanupPlayerRank = "DELETE FROM ck_playerrank WHERE `points` <= 0;"
227-
sql_stray_specificCountryRank = "SELECT COUNT(steamid), country FROM ck_playerrank WHERE country = '{}' AND style = {};"
228-
sql_stray_getPlayerPointsByName = "SELECT points FROM ck_playerrank WHERE name = '{}' AND style = {};"
229-
sql_stray_getPlayerCountryRank = "SELECT COUNT(steamid) + 1 FROM ck_playerrank WHERE country = '{}' AND style = {} AND points > {};"
230-
sql_stray_countryRankPlayerCountryRankByName = "SELECT country FROM ck_playerrank WHERE name = '{}' AND style = {};"
231-
sql_stray_countryTop = "SELECT name, country, points, style FROM ck_playerrank WHERE country = '{}' AND style = {} ORDER BY points DESC LIMIT 100;"
232-
sql_stray_countryTopAllCountries = "SELECT DISTINCT(country) FROM ck_playerrank WHERE style = {} ORDER BY country;"
233-
sql_stray_specificContinentRank = "SELECT COUNT(steamid) FROM ck_playerrank WHERE continentCode = '{}' AND style = {};"
234-
sql_stray_continentPlayerPoints = "SELECT points FROM ck_playerrank WHERE name = '{}' AND style = {};"
235-
sql_stray_continentPlayerRank = "SELECT COUNT(steamid) + 1 FROM ck_playerrank WHERE continentCode = '{}' AND style = {} AND points > {};"
236-
sql_stray_continentPlayerRankByName = "SELECT * FROM ck_playerrank WHERE name = '{}';"
237-
sql_stray_continentGetPlayerContinentByName = "SELECT continentCode FROM ck_playerrank WHERE name = '{}' AND style = {};"
238-
sql_stray_continentTop = "SELECT name, points, style FROM ck_playerrank WHERE continentCode = '{}' AND style = {} ORDER BY points DESC LIMIT 100;"
239-
sql_stray_continentNames = "SELECT DISTINCT(continentCode) FROM ck_playerrank WHERE style = {} AND continentCode IS NOT NULL ORDER BY continentCode;"
240-
sql_stray_viewPlayerRank = "SELECT name, points, style FROM ck_playerrank WHERE style = {} AND points >= (SELECT points FROM ck_playerrank WHERE steamid = '{}' AND style = {}) ORDER BY points;"
241-
sql_stray_getNextRankPoints = "SELECT points FROM ck_playerrank WHERE style = {} ORDER BY points DESC LIMIT {},1;"
242-
sql_stray_viewPlayerInfo = "SELECT steamid, steamid64, name, country, lastseen, joined, connections, timealive, timespec FROM ck_playerrank WHERE steamid = '{}';"
243-
sql_stray_rankCommand = "SELECT name, points FROM ck_playerrank WHERE style = 0 ORDER BY points DESC LIMIT {}, 1;"
244-
sql_stray_rankCommandSelf = "SELECT name, points FROM ck_playerrank WHERE steamid = '{}' AND style = 0;"
245-
sql_stray_selectPlayerRankUnknown = "SELECT steamid, name, points FROM ck_playerrank WHERE name LIKE '%{}%' ORDER BY points DESC LIMIT 0, 1;"
225+
sql_stray_playerRankByName = (
226+
"SELECT steamid FROM ck_playerrank WHERE style = {} AND name LIKE '%{}%' LIMIT 1;"
227+
)
228+
sql_stray_cleanupPlayerRank = "DELETE FROM ck_playerrank WHERE `points` <= 0;"
229+
sql_stray_specificCountryRank = "SELECT COUNT(steamid), country FROM ck_playerrank WHERE country = '{}' AND style = {};"
230+
sql_stray_getPlayerPointsByName = (
231+
"SELECT points FROM ck_playerrank WHERE name = '{}' AND style = {};"
232+
)
233+
sql_stray_getPlayerCountryRank = "SELECT COUNT(steamid) + 1 FROM ck_playerrank WHERE country = '{}' AND style = {} AND points > {};"
234+
sql_stray_countryRankPlayerCountryRankByName = (
235+
"SELECT country FROM ck_playerrank WHERE name = '{}' AND style = {};"
236+
)
237+
sql_stray_countryTop = "SELECT name, country, points, style FROM ck_playerrank WHERE country = '{}' AND style = {} ORDER BY points DESC LIMIT 100;"
238+
sql_stray_countryTopAllCountries = (
239+
"SELECT DISTINCT(country) FROM ck_playerrank WHERE style = {} ORDER BY country;"
240+
)
241+
sql_stray_specificContinentRank = "SELECT COUNT(steamid) FROM ck_playerrank WHERE continentCode = '{}' AND style = {};"
242+
sql_stray_continentPlayerPoints = (
243+
"SELECT points FROM ck_playerrank WHERE name = '{}' AND style = {};"
244+
)
245+
sql_stray_continentPlayerRank = "SELECT COUNT(steamid) + 1 FROM ck_playerrank WHERE continentCode = '{}' AND style = {} AND points > {};"
246+
sql_stray_continentPlayerRankByName = "SELECT * FROM ck_playerrank WHERE name = '{}';"
247+
sql_stray_continentGetPlayerContinentByName = (
248+
"SELECT continentCode FROM ck_playerrank WHERE name = '{}' AND style = {};"
249+
)
250+
sql_stray_continentTop = "SELECT name, points, style FROM ck_playerrank WHERE continentCode = '{}' AND style = {} ORDER BY points DESC LIMIT 100;"
251+
sql_stray_continentNames = "SELECT DISTINCT(continentCode) FROM ck_playerrank WHERE style = {} AND continentCode IS NOT NULL ORDER BY continentCode;"
252+
sql_stray_viewPlayerRank = "SELECT name, points, style FROM ck_playerrank WHERE style = {} AND points >= (SELECT points FROM ck_playerrank WHERE steamid = '{}' AND style = {}) ORDER BY points;"
253+
sql_stray_getNextRankPoints = (
254+
"SELECT points FROM ck_playerrank WHERE style = {} ORDER BY points DESC LIMIT {},1;"
255+
)
256+
sql_stray_viewPlayerInfo = "SELECT steamid, steamid64, name, country, lastseen, joined, connections, timealive, timespec FROM ck_playerrank WHERE steamid = '{}';"
257+
sql_stray_rankCommand = "SELECT name, points FROM ck_playerrank WHERE style = 0 ORDER BY points DESC LIMIT {}, 1;"
258+
sql_stray_rankCommandSelf = (
259+
"SELECT name, points FROM ck_playerrank WHERE steamid = '{}' AND style = 0;"
260+
)
261+
sql_stray_selectPlayerRankUnknown = "SELECT steamid, name, points FROM ck_playerrank WHERE name LIKE '%{}%' ORDER BY points DESC LIMIT 0, 1;"
246262

247263

248264
## point calc
249-
sql_stray_point_calc_finishedStages = "SELECT mapname, stage, (select count(1)+1 from ck_wrcps b where a.mapname=b.mapname and a.runtimepro > b.runtimepro and a.style = b.style and a.stage = b.stage) AS `rank` FROM ck_wrcps a where steamid = '{}' AND style = {};"
250-
sql_stray_point_calc_finishedMaps = "SELECT mapname, (select count(1)+1 from ck_playertimes b where a.mapname=b.mapname and a.runtimepro > b.runtimepro AND b.style = {}) AS `rank`, (SELECT count(1) FROM ck_playertimes b WHERE a.mapname = b.mapname AND b.style = {}) as total, (SELECT tier FROM `ck_maptier` b WHERE a.mapname = b.mapname) as tier FROM ck_playertimes a where steamid = '{}' AND style = {};"
265+
sql_stray_point_calc_finishedStages = "SELECT mapname, stage, (select count(1)+1 from ck_wrcps b where a.mapname=b.mapname and a.runtimepro > b.runtimepro and a.style = b.style and a.stage = b.stage) AS `rank` FROM ck_wrcps a where steamid = '{}' AND style = {};"
266+
sql_stray_point_calc_finishedMaps = "SELECT mapname, (select count(1)+1 from ck_playertimes b where a.mapname=b.mapname and a.runtimepro > b.runtimepro AND b.style = {}) AS `rank`, (SELECT count(1) FROM ck_playertimes b WHERE a.mapname = b.mapname AND b.style = {}) as total, (SELECT tier FROM `ck_maptier` b WHERE a.mapname = b.mapname) as tier FROM ck_playertimes a where steamid = '{}' AND style = {};"

0 commit comments

Comments
 (0)