AcediaFramework
/
Futility
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity
Browse Source

Fix db command's output

feature_improvement
Anton Tarasenko 2 years ago
parent
62ea3e50e6
commit
3f62d15cef
1 changed files with 55 additions and 48 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 103
      sources/Commands/ACommandDB.uc

103
sources/Commands/ACommandDB.uc
Unescape View File

@ -152,6 +152,7 @@ protected function EPlayer PopPlayer(Database relevantDatabase)
{ {
local int i; local int i;
local EPlayer result; local EPlayer result;
if (queueWaitingListPlayers.length <= 0) return none; if (queueWaitingListPlayers.length <= 0) return none;
if (queueWaitingListDatabases.length <= 0) return none; if (queueWaitingListDatabases.length <= 0) return none;
@ -173,30 +174,31 @@ protected function EPlayer PopPlayer(Database relevantDatabase)
return none; return none;
} }
protected function Executed(CallData result, EPlayer callerPlayer) protected function Executed(CallData arguments, EPlayer instigator)
{ {
local AcediaObject valueToWrite; local AcediaObject valueToWrite;
local DBPointerPair pair; local DBPointerPair pair;
local Text subCommand; local Text subCommand;
subCommand = result.subCommandName;
subCommand = arguments.subCommandName;
// Try executing on of the operation that manage multiple databases // Try executing on of the operation that manage multiple databases
if (TryAPICallCommands(subCommand, callerPlayer, result.parameters)) { if (TryAPICallCommands(subCommand, instigator, arguments.parameters)) {
return; return;
} }
// If we have failed - it has got to be one of the operations on // If we have failed - it has got to be one of the operations on
// a single database // a single database
pair = TryLoadingDB(result.parameters.GetText(T(TDATABASE_LINK))); pair = TryLoadingDB(arguments.parameters.GetText(T(TDATABASE_LINK)));
if (pair.database == none) if (pair.database == none)
{ {
callerConsole.WriteLine(T(TBAD_DBLINK)); callerConsole.WriteLine(T(TBAD_DBLINK));
return; return;
} }
// Remember the last player we are making a query to and make that query // Remember the last player we are making a query to and make that query
PushPlayer(callerPlayer, pair.database); PushPlayer(instigator, pair.database);
if (subCommand.StartsWith(T(TWRITE))) if (subCommand.StartsWith(T(TWRITE)))
{ {
valueToWrite = result.parameters.GetItem(T(TJSON_VALUE)); valueToWrite = arguments.parameters.GetItem(T(TJSON_VALUE));
if (result.options.HasKey(T(TINCREMENT))) if (arguments.options.HasKey(T(TINCREMENT)))
{ {
pair.database.IncrementData(pair.pointer, valueToWrite) pair.database.IncrementData(pair.pointer, valueToWrite)
.connect = DisplayResponse; .connect = DisplayResponse;
@ -225,7 +227,7 @@ protected function Executed(CallData result, EPlayer callerPlayer)
// Simple API calls // Simple API calls
private function bool TryAPICallCommands( private function bool TryAPICallCommands(
BaseText subCommand, BaseText subCommand,
EPlayer callerPlayer, EPlayer instigator,
AssociativeArray commandParameters) AssociativeArray commandParameters)
{ {
if (subCommand.IsEmpty()) if (subCommand.IsEmpty())
@ -235,18 +237,18 @@ private function bool TryAPICallCommands(
} }
else if (subCommand.Compare(T(TLIST))) else if (subCommand.Compare(T(TLIST)))
{ {
ListDatabases(callerPlayer); ListDatabases(instigator);
return true; return true;
} }
else if (subCommand.Compare(T(TCREATE))) else if (subCommand.Compare(T(TCREATE)))
{ {
CreateDatabase( callerPlayer, CreateDatabase( instigator,
commandParameters.GetText(T(TDATABASE_NAME))); commandParameters.GetText(T(TDATABASE_NAME)));
return true; return true;
} }
else if (subCommand.Compare(T(TDELETE))) else if (subCommand.Compare(T(TDELETE)))
{ {
DeleteDatabase( callerPlayer, DeleteDatabase( instigator,
commandParameters.GetText(T(TDATABASE_NAME))); commandParameters.GetText(T(TDATABASE_NAME)));
return true; return true;
} }
@ -268,9 +270,9 @@ private function DBPointerPair TryLoadingDB(BaseText databaseLink)
return result; return result;
} }
protected function CreateDatabase(EPlayer callerPlayer, Text databaseName) protected function CreateDatabase(EPlayer instigator, Text databaseName)
{ {
if (callerPlayer == none) { if (instigator == none) {
return; return;
} }
if (_.db.ExistsLocal(databaseName)) if (_.db.ExistsLocal(databaseName))
@ -286,9 +288,9 @@ protected function CreateDatabase(EPlayer callerPlayer, Text databaseName)
} }
} }
protected function DeleteDatabase(EPlayer callerPlayer, Text databaseName) protected function DeleteDatabase(EPlayer instigator, Text databaseName)
{ {
if (callerPlayer == none) { if (instigator == none) {
return; return;
} }
if (_.db.DeleteLocal(databaseName)) { if (_.db.DeleteLocal(databaseName)) {
@ -299,12 +301,13 @@ protected function DeleteDatabase(EPlayer callerPlayer, Text databaseName)
} }
} }
protected function ListDatabases(EPlayer callerPlayer) protected function ListDatabases(EPlayer instigator)
{ {
local int i; local int i;
local array<Text> availableDatabases; local array<Text> availableDatabases;
local ConsoleWriter console; local ConsoleWriter console;
if (callerPlayer == none) {
if (instigator == none) {
return; return;
} }
availableDatabases = _.db.ListLocal(); availableDatabases = _.db.ListLocal();
@ -322,23 +325,23 @@ protected function ListDatabases(EPlayer callerPlayer)
} }
protected function OutputStatus( protected function OutputStatus(
EPlayer callerPlayer, EPlayer instigator,
Database.DBQueryResult error) Database.DBQueryResult error)
{ {
if (callerPlayer == none) { if (instigator == none) {
return; return;
} }
if (error == DBR_Success) { if (error == DBR_Success) {
callerConsole.WriteLine(T(TQUERY_COMPLETED)); instigator.BorrowConsole().WriteLine(T(TQUERY_COMPLETED));
} }
if (error == DBR_InvalidPointer) { if (error == DBR_InvalidPointer) {
callerConsole.WriteLine(T(TQUERY_INVALID_POINTER)); instigator.BorrowConsole().WriteLine(T(TQUERY_INVALID_POINTER));
} }
if (error == DBR_InvalidDatabase) { if (error == DBR_InvalidDatabase) {
callerConsole.WriteLine(T(TQUERY_INVALID_DB)); instigator.BorrowConsole().WriteLine(T(TQUERY_INVALID_DB));
} }
if (error == DBR_InvalidData) { if (error == DBR_InvalidData) {
callerConsole.WriteLine(T(TQUERY_INVALID_DATA)); instigator.BorrowConsole().WriteLine(T(TQUERY_INVALID_DATA));
} }
} }
@ -348,17 +351,18 @@ protected function DisplayData(
Database source) Database source)
{ {
local Text printedJSON; local Text printedJSON;
local EPlayer callerPlayer; local EPlayer instigator;
local Collection dataAsCollection; local Collection dataAsCollection;
callerPlayer = PopPlayer(source);
OutputStatus(callerPlayer, result); instigator = PopPlayer(source);
if (callerPlayer != none && result == DBR_Success) OutputStatus(instigator, result);
if (instigator != none && result == DBR_Success)
{ {
printedJSON = _.json.PrettyPrint(data).IntoText(); printedJSON = _.json.PrettyPrint(data).IntoText();
callerConsole.Write(printedJSON).Flush(); instigator.BorrowConsole().Write(printedJSON).Flush();
_.memory.Free(printedJSON); _.memory.Free(printedJSON);
_.memory.Free(callerPlayer); _.memory.Free(instigator);
callerPlayer = none; instigator = none;
} }
dataAsCollection = Collection(data); dataAsCollection = Collection(data);
if (dataAsCollection != none) { if (dataAsCollection != none) {
@ -373,19 +377,20 @@ protected function DisplaySize(
Database source) Database source)
{ {
local Text sizeAsText; local Text sizeAsText;
local EPlayer callerPlayer; local EPlayer instigator;
callerPlayer = PopPlayer(source);
OutputStatus(callerPlayer, result); instigator = PopPlayer(source);
if (callerPlayer != none && result == DBR_Success) OutputStatus(instigator, result);
if (instigator != none && result == DBR_Success)
{ {
sizeAsText = _.text.FromInt(size); sizeAsText = _.text.FromInt(size);
callerConsole instigator.BorrowConsole()
.Write(T(TOBJECT_SIZE_IS)) .Write(T(TOBJECT_SIZE_IS))
.Write(sizeAsText) .Write(sizeAsText)
.Flush(); .Flush();
_.memory.Free(sizeAsText); _.memory.Free(sizeAsText);
_.memory.Free(callerPlayer); _.memory.Free(instigator);
callerPlayer = none; instigator = none;
} }
} }
@ -395,16 +400,17 @@ protected function DisplayKeys(
Database source) Database source)
{ {
local int i; local int i;
local EPlayer callerPlayer; local EPlayer instigator;
local ConsoleWriter console; local ConsoleWriter console;
callerPlayer = PopPlayer(source);
OutputStatus(callerPlayer, result); instigator = PopPlayer(source);
OutputStatus(instigator, result);
if (keys == none) { if (keys == none) {
return; return;
} }
if (callerPlayer != none && result == DBR_Success) if (instigator != none && result == DBR_Success)
{ {
console = callerConsole; console = instigator.BorrowConsole();
console.Write(T(TOBJECT_KEYS_ARE)); console.Write(T(TOBJECT_KEYS_ARE));
for (i = 0; i < keys.GetLength(); i += 1) for (i = 0; i < keys.GetLength(); i += 1)
{ {
@ -414,8 +420,8 @@ protected function DisplayKeys(
console.UseColor(_.color.jPropertyName).Write(keys.GetText(i)); console.UseColor(_.color.jPropertyName).Write(keys.GetText(i));
} }
console.Flush(); console.Flush();
_.memory.Free(callerPlayer); _.memory.Free(instigator);
callerPlayer = none; instigator = none;
} }
_.memory.Free(keys); _.memory.Free(keys);
} }
@ -424,10 +430,11 @@ protected function DisplayResponse(
Database.DBQueryResult result, Database.DBQueryResult result,
Database source) Database source)
{ {
local EPlayer callerPlayer; local EPlayer instigator;
callerPlayer = PopPlayer(source);
OutputStatus(callerPlayer, result); instigator = PopPlayer(source);
_.memory.Free(callerPlayer); OutputStatus(instigator, result);
_.memory.Free(instigator);
} }
defaultproperties defaultproperties

Write Preview
Loading…
Cancel
Save