mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 10:05:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI: StatisticsPage: Show apps.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2017-12-05 10:06:15 +05:00
parent 78b14681c1
commit c9859945c1
16 changed files with 219 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/FortFirewall.pro
View File

@ -24,6 +24,7 @@ SOURCES += \
log/logentrystattraf.cpp \
log/logmanager.cpp \
log/model/appblockedmodel.cpp \
log/model/appstatmodel.cpp \
log/model/iplistmodel.cpp \
log/model/stringlistmodel.cpp \
mainwindow.cpp \
@ -65,6 +66,7 @@ HEADERS += \
log/logentrystattraf.h \
log/logmanager.h \
log/model/appblockedmodel.h \
log/model/appstatmodel.h \
log/model/iplistmodel.h \
log/model/stringlistmodel.h \
mainwindow.h \

28
src/ui/db/databasemanager.cpp
View File

@ -41,16 +41,16 @@ bool DatabaseManager::initialize()
return fileExists || createTables();
}
void DatabaseManager::handleProcNew(const QString &appPath)
void DatabaseManager::addApp(const QString &appPath, bool &isNew)
{
const qint64 appId = getAppId(appPath);
const qint64 appId = getAppId(appPath, isNew);
m_appPaths.append(appPath);
m_appIds.append(appId);
}
void DatabaseManager::handleStatTraf(quint16 procCount, const quint8 *procBits,
const quint32 *trafBytes)
void DatabaseManager::addTraffic(quint16 procCount, const quint8 *procBits,
const quint32 *trafBytes)
{
QVector<quint16> delProcIndexes;
@ -194,7 +194,7 @@ bool DatabaseManager::createTables()
return res;
}
qint64 DatabaseManager::getAppId(const QString &appPath)
qint64 DatabaseManager::getAppId(const QString &appPath, bool &isNew)
{
qint64 appId = 0;
@ -212,12 +212,15 @@ qint64 DatabaseManager::getAppId(const QString &appPath)
// Create new one
if (!appId) {
SqliteStmt *stmt = getSqliteStmt(DatabaseSql::sqlInsertAppId);
const qint64 unixTime = QDateTime::currentSecsSinceEpoch();
stmt->bindText(1, appPath);
stmt->bindInt64(2, QDateTime::currentSecsSinceEpoch());
stmt->bindInt64(2, unixTime);
stmt->bindInt64(3, unixTime);
if (stmt->step() == SqliteStmt::StepDone) {
appId = m_sqliteDb->lastInsertRowid();
isNew = true;
}
stmt->reset();
}
@ -225,6 +228,19 @@ qint64 DatabaseManager::getAppId(const QString &appPath)
return appId;
}
QStringList DatabaseManager::getAppList()
{
QStringList list;
SqliteStmt *stmt = getSqliteStmt(DatabaseSql::sqlSelectAppPaths);
while (stmt->step() == SqliteStmt::StepRow) {
list.append(stmt->columnText());
}
stmt->reset();
return list;
}
SqliteStmt *DatabaseManager::getSqliteStmt(const char *sql)
{
SqliteStmt *stmt = m_sqliteStmts.value(sql);

10
src/ui/db/databasemanager.h
View File

@ -22,9 +22,11 @@ public:
SqliteDb *sqliteDb() const { return m_sqliteDb; }
void handleProcNew(const QString &path);
void handleStatTraf(quint16 procCount, const quint8 *procBits,
const quint32 *trafBytes);
void addApp(const QString &appPath, bool &isNew);
void addTraffic(quint16 procCount, const quint8 *procBits,
const quint32 *trafBytes);
QStringList getAppList();
signals:
@ -33,7 +35,7 @@ public slots:
private:
bool createTables();
qint64 getAppId(const QString &appPath);
qint64 getAppId(const QString &appPath, bool &isNew);
SqliteStmt *getSqliteStmt(const char *sql);

9
src/ui/db/databasesql.cpp
View File

@ -10,6 +10,7 @@ const char * const DatabaseSql::sqlCreateTables =
"CREATE TABLE app("
" id INTEGER PRIMARY KEY,"
" path TEXT UNIQUE NOT NULL,"
" creat_time INTEGER NOT NULL,"
" unix_time INTEGER NOT NULL,"
" in_bytes INTEGER NOT NULL,"
" out_bytes INTEGER NOT NULL"
@ -63,8 +64,12 @@ const char * const DatabaseSql::sqlSelectAppId =
;
const char * const DatabaseSql::sqlInsertAppId =
"INSERT INTO app(path, unix_time, in_bytes, out_bytes)"
" VALUES(?1, ?2, 0, 0);"
"INSERT INTO app(path, creat_time, unix_time, in_bytes, out_bytes)"
" VALUES(?1, ?2, ?3, 0, 0);"
;
const char * const DatabaseSql::sqlSelectAppPaths =
"SELECT path FROM app ORDER BY creat_time;"
;
const char * const DatabaseSql::sqlInsertTrafficAppHour =

2
src/ui/db/databasesql.h
View File

@ -10,6 +10,8 @@ public:
static const char * const sqlSelectAppId;
static const char * const sqlInsertAppId;
static const char * const sqlSelectAppPaths;
static const char * const sqlInsertTrafficAppHour;
static const char * const sqlInsertTrafficAppDay;
static const char * const sqlInsertTrafficAppMonth;

1
src/ui/fort_qml.qrc
View File

@ -15,6 +15,7 @@
<file>qml/pages/addresses/AddressesColumn.qml</file>
<file>qml/pages/apps/AppsColumn.qml</file>
<file>qml/pages/apps/AppsTextColumn.qml</file>
<file>qml/pages/log/AppListView.qml</file>
<file>qml/pages/schedule/TaskRow.qml</file>
</qresource>
</RCC>

11
src/ui/fortmanager.cpp
View File

@ -17,6 +17,7 @@
#include "fortsettings.h"
#include "log/logmanager.h"
#include "log/model/appblockedmodel.h"
#include "log/model/appstatmodel.h"
#include "log/model/iplistmodel.h"
#include "task/taskinfo.h"
#include "task/taskmanager.h"
@ -42,7 +43,6 @@ FortManager::FortManager(FortSettings *fortSettings,
m_driverManager->driverWorker(), this)),
m_taskManager(new TaskManager(this, this))
{
setupDatabase();
setupDriver();
loadSettings(m_firewallConf);
@ -73,6 +73,8 @@ void FortManager::registerQmlTypes()
"Singleton");
qmlRegisterUncreatableType<AppBlockedModel>("com.fortfirewall", 1, 0, "AppBlockedModel",
"Singleton");
qmlRegisterUncreatableType<AppStatModel>("com.fortfirewall", 1, 0, "AppStatModel",
"Singleton");
qmlRegisterUncreatableType<IpListModel>("com.fortfirewall", 1, 0, "IpListModel",
"Singleton");
@ -94,11 +96,6 @@ void FortManager::registerQmlTypes()
qmlRegisterType<OsUtil>("com.fortfirewall", 1, 0, "OsUtil");
}
bool FortManager::setupDatabase()
{
return m_databaseManager->initialize();
}
bool FortManager::setupDriver()
{
if (!m_driverManager->openDevice()) {
@ -106,7 +103,7 @@ bool FortManager::setupDriver()
return false;
}
m_logManager->setLogReadingEnabled(true);
m_logManager->initialize();
return true;
}

2
src/ui/fortmanager.h
View File

@ -68,8 +68,6 @@ private:
static void registerQmlTypes();
bool setupDatabase();
bool setupDriver();
void closeDriver();

16
src/ui/log/logmanager.cpp
View File

@ -2,28 +2,30 @@
#include "../driver/driverworker.h"
#include "../fortcommon.h"
#include "db/databasemanager.h"
#include "logbuffer.h"
#include "logentryblocked.h"
#include "logentryprocnew.h"
#include "logentrystattraf.h"
#include "model/appblockedmodel.h"
#include "model/appstatmodel.h"
LogManager::LogManager(DatabaseManager *databaseManager,
DriverWorker *driverWorker,
QObject *parent) :
QObject(parent),
m_logReadingEnabled(false),
m_databaseManager(databaseManager),
m_driverWorker(driverWorker),
m_appBlockedModel(new AppBlockedModel(this))
m_appBlockedModel(new AppBlockedModel(this)),
m_appStatModel(new AppStatModel(databaseManager, this))
{
setupDriverWorker();
}
void LogManager::clearModels() const
void LogManager::initialize()
{
m_appBlockedModel->clear();
setLogReadingEnabled(true);
m_appStatModel->initialize();
}
void LogManager::setErrorMessage(const QString &errorMessage)
@ -105,12 +107,12 @@ void LogManager::readLogEntries(LogBuffer *logBuffer)
}
case LogEntry::ProcNew: {
logBuffer->readEntryProcNew(&entryProcNew);
m_databaseManager->handleProcNew(entryProcNew.path());
m_appStatModel->handleProcNew(entryProcNew.path());
break;
}
case LogEntry::StatTraf: {
logBuffer->readEntryStatTraf(&entryStatTraf);
m_databaseManager->handleStatTraf(
m_appStatModel->handleStatTraf(
entryStatTraf.procCount(), entryStatTraf.procBits(),
entryStatTraf.trafBytes());
break;

12
src/ui/log/logmanager.h
View File

@ -4,6 +4,7 @@
#include <QObject>
class AppBlockedModel;
class AppStatModel;
class DatabaseManager;
class DriverWorker;
class LogBuffer;
@ -13,6 +14,7 @@ class LogManager : public QObject
{
Q_OBJECT
Q_PROPERTY(AppBlockedModel *appBlockedModel READ appBlockedModel CONSTANT)
Q_PROPERTY(AppStatModel *appStatModel READ appStatModel CONSTANT)
Q_PROPERTY(QString errorMessage READ errorMessage NOTIFY errorMessageChanged)
public:
@ -21,16 +23,16 @@ public:
QObject *parent = nullptr);
AppBlockedModel *appBlockedModel() const { return m_appBlockedModel; }
AppStatModel *appStatModel() const { return m_appStatModel; }
QString errorMessage() const { return m_errorMessage; }
void initialize();
signals:
void errorMessageChanged();
public slots:
void clearModels() const;
void setLogReadingEnabled(bool enabled);
private slots:
@ -40,7 +42,6 @@ private slots:
private:
void setErrorMessage(const QString &errorMessage);
void setupDatabaseManager();
void setupDriverWorker();
void readLogAsync(LogBuffer *logBuffer);
@ -53,12 +54,11 @@ private:
private:
bool m_logReadingEnabled;
DatabaseManager *m_databaseManager;
DriverWorker *m_driverWorker;
QList<LogBuffer *> m_freeBuffers;
AppBlockedModel *m_appBlockedModel;
AppStatModel *m_appStatModel;
QString m_errorMessage;
};

43
src/ui/log/model/appstatmodel.cpp Normal file
View File

@ -0,0 +1,43 @@
#include "appstatmodel.h"
#include "../../db/databasemanager.h"
AppStatModel::AppStatModel(DatabaseManager *databaseManager,
QObject *parent) :
StringListModel(parent),
m_databaseManager(databaseManager)
{
}
void AppStatModel::initialize()
{
m_databaseManager->initialize();
updateList();
}
void AppStatModel::clear()
{
StringListModel::clear();
}
void AppStatModel::updateList()
{
setList(m_databaseManager->getAppList());
}
void AppStatModel::handleProcNew(const QString &appPath)
{
bool isNew = false;
m_databaseManager->addApp(appPath, isNew);
if (isNew) {
insert(appPath);
}
}
void AppStatModel::handleStatTraf(quint16 procCount, const quint8 *procBits,
const quint32 *trafBytes)
{
m_databaseManager->addTraffic(procCount, procBits, trafBytes);
}

34
src/ui/log/model/appstatmodel.h Normal file
View File

@ -0,0 +1,34 @@
#ifndef APPSTATMODEL_H
#define APPSTATMODEL_H
#include "stringlistmodel.h"
class DatabaseManager;
class AppStatModel : public StringListModel
{
Q_OBJECT
public:
explicit AppStatModel(DatabaseManager *databaseManager,
QObject *parent = nullptr);
void initialize();
void handleProcNew(const QString &appPath);
void handleStatTraf(quint16 procCount, const quint8 *procBits,
const quint32 *trafBytes);
signals:
public slots:
void clear() override;
private:
void updateList();
private:
DatabaseManager *m_databaseManager;
};
#endif // APPSTATMODEL_H

1
src/ui/log/model/stringlistmodel.h
View File

@ -14,6 +14,7 @@ public:
int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
const QStringList &list() const { return m_list; }
void setList(const QStringList &list);
protected:

51
src/ui/qml/pages/BlockedPage.qml
View File

@ -2,6 +2,7 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import "../controls"
import "log"
import com.fortfirewall 1.0
BasePage {
@ -16,7 +17,7 @@ BasePage {
function clearAppPaths() {
appListView.currentIndex = -1;
logManager.clearModels();
appBlockedModel.clear();
}
HostInfoCache {
@ -80,58 +81,12 @@ BasePage {
anchors.fill: parent
spacing: 20
ListView {
AppListView {
id: appListView
Layout.fillWidth: true
Layout.fillHeight: true
spacing: 10
model: appBlockedModel
highlightRangeMode: ListView.ApplyRange
highlightResizeDuration: 0
highlightMoveDuration: 200
highlight: Item {
Rectangle {
anchors.fill: parent
anchors.margins: -7
radius: 2
border.width: 3
border.color: palette.highlight
color: "transparent"
}
}
delegate: Row {
id: appItem
width: appListView.width
spacing: 6
readonly property string appPath: display
// TODO: Use SHGetFileInfo() to get app's display name and icon
Image {
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
source: "qrc:/images/application.png"
}
Label {
font.pixelSize: 20
elide: Text.ElideRight
text: fileUtil.fileName(appItem.appPath)
}
}
MouseArea {
anchors.fill: parent
onClicked: {
const index = appListView.indexAt(mouse.x, mouse.y);
if (index >= 0) {
appListView.currentIndex = index;
}
}
}
}
ListView {

25
src/ui/qml/pages/StatisticsPage.qml
View File

@ -2,11 +2,17 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import "../controls"
import "log"
import com.fortfirewall 1.0
BasePage {
readonly property LogManager logManager: fortManager.logManager
readonly property AppStatModel appStatModel: logManager.appStatModel
readonly property string currentAppPath:
(appListView.currentIndex >= 0 && appListView.currentItem)
? appListView.currentItem.appPath : ""
ColumnLayout {
anchors.fill: parent
@ -38,6 +44,25 @@ BasePage {
Layout.fillWidth: true
Layout.fillHeight: true
clip: true
RowLayout {
anchors.fill: parent
spacing: 20
AppListView {
id: appListView
Layout.fillWidth: true
Layout.fillHeight: true
model: appStatModel
}
}
}
TextFieldFrame {
Layout.fillWidth: true
text: currentAppPath || ""
}
}
}

54
src/ui/qml/pages/log/AppListView.qml Normal file
View File

@ -0,0 +1,54 @@
import QtQuick 2.9
import QtQuick.Controls 2.2
import com.fortfirewall 1.0
ListView {
id: appListView
spacing: 10
highlightRangeMode: ListView.ApplyRange
highlightResizeDuration: 0
highlightMoveDuration: 200
highlight: Item {
Rectangle {
anchors.fill: parent
anchors.margins: -7
radius: 2
border.width: 3
border.color: palette.highlight
color: "transparent"
}
}
delegate: Row {
id: appItem
width: appListView.width
spacing: 6
readonly property string appPath: display
// TODO: Use SHGetFileInfo() to get app's display name and icon
Image {
anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: 1
source: "qrc:/images/application.png"
}
Label {
font.pixelSize: 20
elide: Text.ElideRight
text: fileUtil.fileName(appItem.appPath)
}
}
MouseArea {
anchors.fill: parent
onClicked: {
const index = appListView.indexAt(mouse.x, mouse.y);
if (index >= 0) {
appListView.currentIndex = index;
}
}
}
}