yolinlin/aowow
1
0
Fork 0
mirror of https://github.com/Sarjuuk/aowow.git synced 2025-11-29 15:58:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Misc/Fixup

Browse Source 
* floating changes against profiler
 * no functional changes
This commit is contained in:
Sarjuuk
2025-04-02 21:49:25 +02:00
parent e29d1e69fe
commit 790264ba08
4 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
includes/ajaxHandler/arenateam.class.php
View File

@@ -76,8 +76,7 @@ class AjaxArenaTeam extends AjaxHandler
*/ */
protected function handleStatus() : string protected function handleStatus() : string
{ {
$response = Profiler::resyncStatus(Type::ARENA_TEAM, $this->_get['id']); return Profiler::resyncStatus(Type::ARENA_TEAM, $this->_get['id']);
return Util::toJSON($response);
} }
} }

3
includes/ajaxHandler/guild.class.php
View File

@@ -76,8 +76,7 @@ class AjaxGuild extends AjaxHandler
*/ */
protected function handleStatus() : string protected function handleStatus() : string
{ {
$response = Profiler::resyncStatus(Type::GUILD, $this->_get['id']); return Profiler::resyncStatus(Type::GUILD, $this->_get['id']);
return Util::toJSON($response);
} }
} }

3
includes/ajaxHandler/profile.class.php
View File

@@ -307,8 +307,7 @@ class AjaxProfile extends AjaxHandler
return Util::toJSON([1, [PR_QUEUE_STATUS_ERROR, 0, 0, PR_QUEUE_ERROR_CHAR]]); return Util::toJSON([1, [PR_QUEUE_STATUS_ERROR, 0, 0, PR_QUEUE_ERROR_CHAR]]);
} }
$response = Profiler::resyncStatus(Type::PROFILE, $ids); return Profiler::resyncStatus(Type::PROFILE, $ids);
return Util::toJSON($response);
} }
/* params (get)) /* params (get))

33
includes/components/profiler.class.php
View File

@@ -296,9 +296,34 @@ class Profiler
return $newId; return $newId;
} }
public static function resyncStatus($type, array $subjectGUIDs) /* return
<status object> [
nQueueProcesses,
[statusCode, timeToRefresh, curQueuePos, errorCode, nResyncs],
[<anotherStatus>]
...
]
statusCode:
0: end the request
1: waiting
2: working...
3: ready; click to view
4: error / retry
timeToRefresh:
msec till the client may ask for another update
curQueuePos:
position in the queue
errorCode:
0: unk error
1: char does not exist
2: armory gone
nResyncs:
??? .. if !nResyncs && !timeToRefresh prints "Adding to queue..." but will not ping the server for updates...?
*/
public static function resyncStatus(int $type, array $subjectGUIDs) : string
{ {
$response = [Cfg::get('PROFILER_ENABLE') ? 2 : 0]; // in theory you could have multiple queues; used as divisor for: (15 / x) + 2 $response = [Cfg::get('PROFILER_ENABLE') ? 2 : 0]; // in theory you could have multiple queues; used as divisor in wait time estimation: (15 / x) + 2
if (!$subjectGUIDs) if (!$subjectGUIDs)
$response[] = [PR_QUEUE_STATUS_ENDED, 0, 0, PR_QUEUE_ERROR_CHAR]; $response[] = [PR_QUEUE_STATUS_ENDED, 0, 0, PR_QUEUE_ERROR_CHAR];
else else
@@ -320,12 +345,12 @@ class Profiler
$subjectStatus[$guid]['status'] != PR_QUEUE_STATUS_READY ? Cfg::get('PROFILER_RESYNC_PING') : 0, $subjectStatus[$guid]['status'] != PR_QUEUE_STATUS_READY ? Cfg::get('PROFILER_RESYNC_PING') : 0,
array_search($type.':'.$guid, $queue) + 1, array_search($type.':'.$guid, $queue) + 1,
0, 0,
1 // nResycTries - unsure about this one 1 // nResyncs - unsure about this one
); );
} }
} }
return $response; return Util::toJSON($response);
} }
public static function getCharFromRealm($realmId, $charGuid) public static function getCharFromRealm($realmId, $charGuid)