Skip to content
Permalink
Browse files

Merge branch 'master' of https://github.com/Marlamin/wow.tools

  • Loading branch information...
Marlamin committed Oct 8, 2019
2 parents 64b4581 + 5694393 commit 4056b5dd50feefaf575aca884c273155c13d7fa2
Showing with 17 additions and 8 deletions.
  1. +3 −3 builds/scripts/updateGameData.php
  2. +10 −1 builds/scripts/updateTypes.php
  3. +1 −1 files/submitQueue.php
  4. +3 −3 mv/modelviewer.js
@@ -3,7 +3,7 @@
include("../../inc/config.php");
$q = $pdo->query("SELECT description FROM wow_buildconfig WHERE product = 'wowt' ORDER BY description DESC LIMIT 1");
$q = $pdo->query("SELECT description FROM wow_buildconfig WHERE product = 'wowt' AND ID > 1575 ORDER BY description DESC LIMIT 1");
$row = $q->fetch();
$rawdesc = str_replace("WOW-", "", $row['description']);
@@ -14,14 +14,14 @@
function importDB2($name, $outdir, $fields){
global $pdo;
$db2 = "https://wow.tools/api/export/?name=".$name."&build=".$outdir;
$db2 = "https://wow.tools/api/export/?name=".$name."&build=".$outdir."&t=".strtotime("now");
$csv = "/tmp/".$name.".csv";
if(file_exists($csv)){ unlink($csv); }
$outputdump = shell_exec("/usr/bin/curl ".escapeshellarg($db2)." -o ".escapeshellarg($csv)." 2>&1");
if(!file_exists($csv)){
echo "An error occured during ".$name." import: ".$outputdump;
}else{
echo " Writing ".$name."..";
echo " Writing ".$name." (".$outdir.")..";
$pdo->exec("
LOAD DATA LOCAL INFILE '".$csv."'
INTO TABLE `wowdata`.".$name."
@@ -12,7 +12,7 @@
if($row['id'] == 841983) continue; // Skip signaturefile
$ext = pathinfo($row['filename'], PATHINFO_EXTENSION);
if($ext == "unk") continue;
if($ext == "unk" || empty($ext)) continue;
echo "Adding type ".$ext." for FileData ID " . $row['id']."\n";
@@ -26,6 +26,8 @@
$textureFileData = $pdo->query("SELECT FileDataID FROM wowdata.texturefiledata")->fetchAll(PDO::FETCH_COLUMN);
$movieFileData = $pdo->query("SELECT ID FROM wowdata.moviefiledata")->fetchAll(PDO::FETCH_COLUMN);
$mp3Manifest = $pdo->query("SELECT ID FROM wowdata.manifestmp3")->fetchAll(PDO::FETCH_COLUMN);
$skitManifest = $pdo->query("SELECT ID from wowdata.soundkitentry")->fetchAll(PDO::FETCH_COLUMN);
$cdi = $pdo->query("SELECT PortraitTextureFileDataID, `TextureVariationFileDataID[0]`, `TextureVariationFileDataID[1]`, `TextureVariationFileDataID[2]` FROM wowdata.creaturedisplayinfo");
$cdifdids = [];
foreach($cdi->fetchAll(PDO::FETCH_ASSOC) as $entry){
@@ -70,6 +72,13 @@
$uq->bindParam(":id", $file['id']);
$uq->execute();
}
if(in_array($file['id'], $skitManifest)){
echo "File " . $file['id'] . " is an ogg!\n";
$uq->bindValue(":type", "ogg");
$uq->bindParam(":id", $file['id']);
$uq->execute();
}
}
/* Unknown but decrypted */
@@ -84,7 +84,7 @@
<?php
$previousTime = '';
$cq = $pdo->prepare("SELECT filename FROM wow_rootfiles WHERE id = ?");
$suggestions = $pdo->query("SELECT * FROM wow_rootfiles_suggestions WHERE status = 'todo'")->fetchAll();
$suggestions = $pdo->query("SELECT * FROM wow_rootfiles_suggestions WHERE status = 'todo' ORDER BY submitted DESC")->fetchAll();
if(count($suggestions) == 0){
echo "There are currently no submitted files waiting for approval.";
}else{
@@ -20,9 +20,9 @@ var Elements =

var Current =
{
buildConfig: "edece5d974f65c808160c75026123699",
cdnConfig: "da2558dea92f537b793ad6fe1eaaaeeb",
buildName: "8.2.5.31337",
buildConfig: "b847e6ab3a8638dda359c379ace9d79f",
cdnConfig: "1fdb7f2ada5eae29f7073aedbe96bf9d",
buildName: "8.3.0.32044",
fileDataID: 397940,
type: "m2",
embedded: false

0 comments on commit 4056b5d

Please sign in to comment.
You can’t perform that action at this time.