hash/d2tools
1
0
Fork 0
mirror of https://gitlab.com/hashborgir/d2tools.git synced 2024-11-30 04:26:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

In memory data refactor, less queries, cube/unique doc backend working fast

Browse Source
This commit is contained in:
color.diff=auto 2021-05-12 19:00:56 -06:00
parent ca04aa615f
commit 5eced413cb
7 changed files with 15188 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ajax/uniqueitems.php
View File

@ -134,8 +134,8 @@ WHERE `type` IS NOT NULL AND uniqueitems.`code`= $table.`code` AND $table.`code`
*/
if ($cmd == 'search') {
$search = $_GET['search'];
$sql = "SELECT * FROM uniqueitems WHERE `index` LIKE '%$search%' OR `code` LIKE '%$search%' AND `enabled`=1 ORDER BY `index`";
$res = PDO_FetchAll($sql);
$sql = "SELECT * FROM uniqueitems WHERE `index` LIKE '%?%' OR code LIKE '%?%' AND enabled=1 ORDER BY `index`";
$res = PDO_FetchAll($sql,[$search, $search]);
$html = '';
foreach ($res as $r) {
if ($sort == 'index') {
@ -160,10 +160,10 @@ if ($cmd == 'getString') {
$prop = $_GET['prop'];
$sql = "SELECT stat1,stat2,stat3,stat4,stat5,stat6,stat7 FROM `properties` WHERE `code` = '$prop'";
$stat = array_filter(PDO_FetchRow($sql));
$sql = "SELECT stat1,stat2,stat3,stat4,stat5,stat6,stat7 FROM properties WHERE code = ?";
$stat = array_filter(PDO_FetchRow($sql, [$prop]));
$s = array_filter($idata->getIscStrings($stat['stat1']));
$s = array_filter($idata->getIscStrings($prop));
// now combine isc strings with par, min, max

50
docs/Ironman/cubemain.html
View File

File diff suppressed because one or more lines are too long

14927
docs/Ironman/uniqueitems.html Normal file
View File

File diff suppressed because it is too large Load Diff

119
genDocs.php
View File

@ -124,6 +124,24 @@ $htmltop = <<<EOT
font-family: Lato;
}
.item {
text-align: left;
position:relative;
right:0px;
}
.item_desc {
height: 600px;
width: 620px;
position: relative;
left: 0px;
top: 0px;
text-align: center;
padding: 10px;
text-transform: uppercase;
}
.item_stats{
width: auto;
@ -163,7 +181,7 @@ $htmltop = <<<EOT
$(document).ready(function() {
// $('.cubetable').dataTable();
$('.cubetable').dataTable();
} );
@ -201,8 +219,8 @@ EOT;
*
*/
$dir = getcwd() . "/docs/{$_SESSION['modname']}";
mkdir($dir, 0777, true);
if ($cmd == "genDocUniqueItems") {
// grab unique item index only (to save on memory)
@ -369,7 +387,7 @@ if ($cmd == "genDocCube") {
body{
background: white;
color: black;
font-family: ExocetLight;
font-family: ExocetHeavy;
text-transform: uppercase;
}
@ -411,16 +429,36 @@ if ($cmd == "genDocCube") {
}
.desc {
width: 25%;
width: 200px;
font-family: ExocetHeavy;
font-size: 1.25em;
text-transform: uppercase;
background: #111;
}
.input1,.input3,.input5,.input7{
background: #444;
}
.input2, .input4, .input6 {
background: #333;
}
.output1{
background: #222;
}
.output2 {
background: #222;
}
.output3 {
background: #222;
}
td {
width: auto;
height: 240px;
text-align: center;
vertical-align: middle;
padding: 10px;
padding: 10px;
}
</style>
EOT;
@ -493,7 +531,11 @@ EOT;
*/
foreach ($res as $r) {
$desc = $r['description'];
$desc = str_replace('+', '<br>+<br>', $r['description']);
$desc = str_replace('->', '<br><span class="" style="color: gold;font-size:1.25em;">=<br>', $desc);
$desc .= "</span>";
//ddump($desc);
//var_dump($r);
// grab all inputs
$input_codes = array_filter(
@ -955,7 +997,7 @@ EOT;
$htmlFinal .= $tableBottom . $htmlbottom;
file_put_contents("$dir/cubemain.html", $htmlFinal);
header("Location: /docs/{$_SESSION['modname']}/cubemain.html");
header("Location: docs/{$_SESSION['modname']}/cubemain.html");
}
@ -965,28 +1007,45 @@ if ($cmd == "getIscStrings") {
// $sql = "SELECT p.`code` as prop,
// p.stat1,
// i.descstrpos,
// i.descstr2,
// i.descfunc,
// i.descval,
// s1.String as string1,
// s2.String as string2
// FROM properties as p
// LEFT JOIN itemstatcost as i
// ON p.stat1 = i.Stat
// LEFT JOIN strings as s1
// ON i.descstrpos = s1.Key
// LEFT JOIN strings as s2
// ON i.descstr2 = s2.Key";
// $res = PDO_FetchAll($sql);
//
// $isc = null;
// foreach ($res as $r) {
// $isc[$r['prop']] = $r;
// $isc[$r['prop']]['prop'] = $r['prop'];
// }
$sql = "
SELECT p.`code` as prop,
p.stat1,
i.descstrpos,
i.descstr2,
i.descfunc,
i.descval,
i.dgrp,
i.dgrpfunc,
i.dgrpval,
i.dgrpstrpos,
i.dgrpstrneg,
s1.String as string1,
s2.String as string2,
s3.String as gstring1,
s4.String as gstring2
FROM properties as p
LEFT JOIN itemstatcost as i
ON p.stat1 = i.Stat
LEFT JOIN strings as s1
ON i.descstrpos = s1.Key
LEFT JOIN strings as s2
ON i.descstr2 = s2.Key
LEFT JOIN strings as s3
ON i.dgrpstrpos = s3.Key
LEFT JOIN strings as s4
ON i.dgrpstr2= s4.Key
";
$res = PDO_FetchAll($sql);
$isc = null;
foreach ($res as $r) {
$isc[$r['prop']] = $r;
$isc[$r['prop']]['prop'] = $r['prop'];
}
var_dump($isc);

9
res/style.css
View File

@ -278,12 +278,3 @@ pre {outline: 1px solid #ccc; padding: 5px; margin: 5px; }
color: #4169E1; /* Magic color*/
}
.output1{
background: #222;
}
.output2 {
}
.output3 {
}

153
src/D2ItemData.php
View File

@ -2,11 +2,13 @@
class D2ItemData {
public $strings;
public function uniqueItems($index, $doc = FALSE) {
// This is where we get props for each item
$sql = "SELECT * FROM `uniqueitems` WHERE `enabled`='1' AND `index`=\"$index\"";
$sql = "SELECT * FROM uniqueitems WHERE enabled='1' AND `index`=?";
$res = (PDO_FetchRow($sql));
$res = (PDO_FetchRow($sql, [$index]));
/*
*
@ -26,14 +28,14 @@ class D2ItemData {
// if no invfile, get from other tables
// try to get from armor, weapons, misc
$sql = "SELECT invfile FROM armor WHERE code='{$res['code']}'";
$invfile[] = PDO_FetchRow($sql);
$sql = "SELECT invfile FROM armor WHERE code=?";
$invfile[] = PDO_FetchRow($sql, [$res['code']]);
$sql = "SELECT invfile FROM weapons WHERE code='{$res['code']}'";
$invfile[] = PDO_FetchRow($sql);
$sql = "SELECT invfile FROM weapons WHERE code=?";
$invfile[] = PDO_FetchRow($sql, [$res['code']]);
$sql = "SELECT invfile FROM misc WHERE code='{$res['code']}'";
$invfile[] = PDO_FetchRow($sql);
$sql = "SELECT invfile FROM misc WHERE code=?";
$invfile[] = PDO_FetchRow($sql, [$res['code']]);
$invfile = array_filter($invfile);
@ -41,17 +43,17 @@ class D2ItemData {
$x[] = $i;
}
if(!empty($x[0])){
if (!empty($x[0])) {
$x[0] = array_filter($x[0]);
}
$invClean = $x[0];
if (!empty($invClean)){
if (!empty($invClean)) {
$return = array_merge($res, $invClean);
} else {
$return = $res;
}
$return = array_merge($res, $invClean);
//$return = array_merge($res, $invClean);
} else {
$return = $res;
}
@ -105,19 +107,20 @@ class D2ItemData {
//
//
// ( Also need func1 and val1 for each prop )
//
//
//
//
// for each prop, get stat
$counter = 1;
foreach ($props as $key => $val) {
// val = Prop1,Prop2 etc.
// for each propr, get all 7 stats in ISC
$sql = "SELECT stat1 FROM `properties` WHERE `code` = '{$val['prop' . $counter]}'";
$props[$key]['stat'] = PDO_FetchRow($sql);
if (!empty($props[$key]['stat'])){
// for now only get stat1, and for else, use dgrp
$sql = "SELECT stat1 FROM properties WHERE code = ?";
$props[$key]['stat'] = PDO_FetchRow($sql, [$val['prop' . $counter]]);
if (!empty($props[$key]['stat'])) {
$props[$key]['stat'] = array_filter($props[$key]['stat']);
}
@ -127,7 +130,7 @@ class D2ItemData {
//ddump($props);
$counter = 1;
$counter = 1;
//each stat now goes into getIscStrings
foreach ($props as $k => $v) {
//ddump($v);
@ -140,8 +143,6 @@ $counter = 1;
$counter = 1;
foreach ($props as $k => $v) { // for each property Prop1 Prop2
// $sql = "SELECT val$counter,func$counter FROM `properties` WHERE `code`=\"{$return['prop' . $counter]}\"";
// $funcval = PDO_FetchRow($sql);
//
@ -149,14 +150,19 @@ $counter = 1;
$params = [
'string1' => $v['desc']['string1'],
'string2' => $v['desc']['string2'],
'gstring1' => $v['desc']['gstring1'],
'gstring2' => $v['desc']['gstring2'],
'descfunc' => $v['desc']['descfunc'],
'descval' => $v['desc']['descval'],
'dgrp' => $v['desc']['dgrp'],
'dgrpfunc' => $v['desc']['dgrpfunc'],
'dgrpval' => $v['desc']['dgrpval'],
"prop" => $return['prop' . $counter],
"par" => $return['par' . $counter],
"min" => $return['min' . $counter],
"max" => $return['max' . $counter],
// "val1" => $funcval['val1'],
// "func1" => $funcval['func1']
// "val1" => $funcval['val1'],
// "func1" => $funcval['func1']
// 'item' => $return
];
@ -174,37 +180,34 @@ $counter = 1;
$return['props'] = $props;
$sqlArmor = "SELECT * FROM armor WHERE code='{$res['code']}'";
$sqlMisc = "SELECT * FROM misc WHERE code='{$res['code']}'";
$sqlWeapons = "SELECT * FROM weapons WHERE code='{$res['code']}'";
$sqlArmor = "SELECT * FROM armor WHERE code=?";
$sqlMisc = "SELECT * FROM misc WHERE code=?";
$sqlWeapons = "SELECT * FROM weapons WHERE code=?";
$baseItemInfo = PDO_FetchRow($sqlArmor);
$baseItemInfo = PDO_FetchRow($sqlArmor, [$res['code']]);
$uTable = "armor";
if (empty($baseItemInfo)) {
$baseItemInfo = PDO_FetchRow($sqlMisc);
$baseItemInfo = PDO_FetchRow($sqlMisc, [$res['code']]);
}
if (empty($baseItemInfo)) {
$baseItemInfo = PDO_FetchRow($sqlWeapons);
$baseItemInfo = PDO_FetchRow($sqlWeapons, [$res['code']]);
}
$return['baseItemInfo'] = $baseItemInfo;
if(!empty($baseItemInfo)){
if (!empty($baseItemInfo)) {
$return['baseItemInfo'] = array_filter($baseItemInfo);
}
if(!$doc){
if (!$doc) {
header('Content-Type: application/json');
return json_encode($return, JSON_INVALID_UTF8_IGNORE | JSON_PRETTY_PRINT);
} else {
return $return;
}
}
// function getIscStringsX($iscStat) {
//// $sql = "
////SELECT s1.String as string1, s2.String as string2, descfunc, descval
@ -284,42 +287,60 @@ $counter = 1;
public function getIscStrings($iscStat) {
$sql = "SELECT p.`code` as prop,
p.stat1,
i.descstrpos,
i.descstr2,
i.descfunc,
i.descval,
s1.String as string1,
s2.String as string2
FROM properties as p
LEFT JOIN itemstatcost as i
ON p.stat1 = i.Stat
LEFT JOIN strings as s1
ON i.descstrpos = s1.Key
LEFT JOIN strings as s2
ON i.descstr2 = s2.Key
WHERE p.code = \"$iscStat\"
if (empty($this->strings)){
$this->getStrings();
}
return ($this->strings[$iscStat]);
}
public function getStrings() {
$sql = "
SELECT p.`code` as prop,
p.stat1,
i.descstrpos,
i.descstr2,
i.descfunc,
i.descval,
i.dgrp,
i.dgrpfunc,
i.dgrpval,
i.dgrpstrpos,
i.dgrpstrneg,
s1.String as string1,
s2.String as string2,
s3.String as gstring1,
s4.String as gstring2
FROM properties as p
LEFT JOIN itemstatcost as i
ON p.stat1 = i.Stat
LEFT JOIN strings as s1
ON i.descstrpos = s1.Key
LEFT JOIN strings as s2
ON i.descstr2 = s2.Key
LEFT JOIN strings as s3
ON i.dgrpstrpos = s3.Key
LEFT JOIN strings as s4
ON i.dgrpstr2= s4.Key
";
// where p.code = iscstat
return PDO_FetchRow($sql);
$strings = PDO_FetchAll($sql);
//var_dump($strings);
foreach($strings as $k => $v){
$this->strings[$v['prop']] = $v;
}
}
public function genDoc($itemData){
}
}

27
src/D2ItemDesc.php
View File

@ -268,6 +268,15 @@ class D2ItemDesc {
*/
public function __construct() {
}
public function getDesc($params = []) {
if (empty($params))
return false;
@ -281,6 +290,14 @@ class D2ItemDesc {
$min = (int) $params['min'];
$v = $par;
// if ($params['dgrp']){
// $s1 = $params['gstring1'];
// $s2 = $params['gstring2'];
// $params['descfunc'] = $params['dgrpfunc'];
// $params['descval'] = $params['dgrpval'];
// }
if (empty($par)) {
$v = $min;
}
@ -291,11 +308,13 @@ class D2ItemDesc {
$max = '';
}
foreach ($this->skilltabs as $s) {
$sql = "SELECT `String` FROM `strings` WHERE `Key`='$s'";
$this->skilltabsDesc[] = PDO_FetchRow($sql);
}
if (empty($this->skilltabsDesc)){
foreach ($this->skilltabs as $s) {
$sql = "SELECT String FROM strings WHERE Key=?";
$this->skilltabsDesc[] = PDO_FetchRow($sql, [$s]);
}
}
//ddump($this->skilltabsDescClean);
/*