MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-04-17 05:43:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

cleanup code

Browse Source
This commit is contained in:
pypy
2020-11-07 19:41:50 +09:00
parent e6e797f7d6
commit 77558f8835
2 changed files with 50 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
SQLite.cs
View File

@@ -37,6 +37,47 @@ namespace VRCX
m_Connection.Dispose();
}
public void Execute(IJavascriptCallback callback, string sql, IDictionary<string, object> args = null)
{
try
{
m_ConnectionLock.EnterReadLock();
try
{
using (var command = new SQLiteCommand(sql, m_Connection))
{
if (args != null)
{
foreach (var arg in args)
{
command.Parameters.Add(new SQLiteParameter(arg.Key, arg.Value));
}
}
using (var reader = command.ExecuteReader())
{
while (reader.Read() == true)
{
var values = new object[reader.FieldCount];
reader.GetValues(values);
callback.ExecuteAsync(null, values);
}
}
}
callback.ExecuteAsync(null, null);
}
finally
{
m_ConnectionLock.ExitReadLock();
}
}
catch (Exception e)
{
callback.ExecuteAsync(e.Message, null);
}
callback.Dispose();
}
public int ExecuteNonQuery(string sql, IDictionary<string, object> args = null)
{
int result = -1;
@@ -66,48 +107,5 @@ namespace VRCX
return result;
}
public void Execute(IJavascriptCallback fetchCallback, IJavascriptCallback resolveCallback, IJavascriptCallback rejectCallback, string sql, IDictionary<string, object> args = null)
{
try
{
m_ConnectionLock.EnterReadLock();
try
{
using (var command = new SQLiteCommand(sql, m_Connection))
{
if (args != null)
{
foreach (var arg in args)
{
command.Parameters.Add(new SQLiteParameter(arg.Key, arg.Value));
}
}
using (var reader = command.ExecuteReader())
{
while (reader.Read() == true)
{
var values = new object[reader.FieldCount];
reader.GetValues(values);
fetchCallback.ExecuteAsync(values);
}
}
}
resolveCallback.ExecuteAsync();
}
finally
{
m_ConnectionLock.ExitReadLock();
}
}
catch (Exception e)
{
rejectCallback.ExecuteAsync(e.Message);
}
fetchCallback.Dispose();
resolveCallback.Dispose();
rejectCallback.Dispose();
}
}
}

10
html/src/service/sqlite.js
View File

@@ -3,7 +3,15 @@
class SQLiteService {
execute(callback, sql, args = null) {
return new Promise((resolve, reject) => {
SQLite.Execute(callback, resolve, reject, sql, args);
SQLite.Execute((err, data) => {
if (err !== null) {
reject(err);
} else if (data === null) {
resolve();
} else {
callback(data);
}
}, sql, args);
});
}