uni-days/sea_transport_project
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apparatus little overhaul

Browse source
This commit is contained in:
Andrew nuark G 2020-12-19 00:09:40 +07:00
parent 75e15bcc2b
commit 1c48512f62
2 changed files with 21 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

45
sea_transport/system/apparatus.cpp
View file

@ -4,16 +4,9 @@
apparatus *apparatus::_instance = nullptr; apparatus *apparatus::_instance = nullptr;
const QString apparatus::filename = "data.bin"; const QString apparatus::filename = "data.bin";
void apparatus::open_reading_stream() { void apparatus::open_stream() {
this->_bin_file = new QFile(apparatus::filename); this->_bin_file = new QFile(apparatus::filename);
this->_bin_file->open(QIODevice::ReadOnly); this->_bin_file->open(QIODevice::ReadWrite);
stream.setDevice(_bin_file);
}
void apparatus::open_writing_stream() {
this->_bin_file = new QFile(apparatus::filename);
this->_bin_file->open(QIODevice::WriteOnly);
stream.setDevice(_bin_file); stream.setDevice(_bin_file);
} }
@ -27,35 +20,27 @@ void apparatus::close_stream() {
} }
apparatus::apparatus() { apparatus::apparatus() {
this->open_reading_stream();
this->loadGIDS();
this->deserialize_data();
this->close_stream();
} }
apparatus::~apparatus() { apparatus::~apparatus() {
if (this->_bin_file) { this->shutdown();
this->_bin_file->flush();
this->_bin_file->close();
delete this->_bin_file;
this->_bin_file = nullptr;
}
} }
apparatus& apparatus::instance() { apparatus& apparatus::instance() {
if (apparatus::_instance == nullptr) { if (apparatus::_instance == nullptr) {
apparatus::init(); throw std::runtime_error("System non initialized!");
} }
return *apparatus::_instance; return *apparatus::_instance;
} }
bool apparatus::isFirstRun() { bool apparatus::isFirstRun() {
return QFile(apparatus::filename).exists(); return QFile().exists("first_run");
} }
void apparatus::generate_empty_data() { void apparatus::generate_empty_data() {
this->open_writing_stream(); this->open_stream();
this->writeGIDS(); this->writeGIDS();
this->serialize_data(); this->serialize_data();
this->close_stream(); this->close_stream();
@ -71,15 +56,18 @@ const object_system& apparatus::get_object_subsystem() {
void apparatus::init() { void apparatus::init() {
apparatus::_instance = new apparatus(); apparatus::_instance = new apparatus();
apparatus::instance().open_stream();
apparatus::instance().loadGIDS();
apparatus::instance().deserialize_data();
apparatus::instance().close_stream();
} }
void apparatus::shutdown() { void apparatus::shutdown() {
if (apparatus::_instance != nullptr) { apparatus::instance().open_stream();
apparatus::_instance->open_writing_stream(); apparatus::instance().writeGIDS();
apparatus::_instance->writeGIDS(); apparatus::instance().serialize_data();
apparatus::_instance->serialize_data(); apparatus::instance().close_stream();
apparatus::_instance->close_stream();
}
} }
void apparatus::writeGIDS() { void apparatus::writeGIDS() {
@ -96,6 +84,7 @@ void apparatus::loadGIDS() {
} }
void apparatus::serialize_data() { void apparatus::serialize_data() {
QFile().remove("first_run");
this->_auth_system.init(this->stream); this->_auth_system.init(this->stream);
this->_object_system.init(this->stream); this->_object_system.init(this->stream);
} }

9
sea_transport/system/apparatus.h
View file

@ -4,13 +4,13 @@
#include "auth_system.h" #include "auth_system.h"
#include "object_system.h" #include "object_system.h"
#include "../entities/vessel_entity.h"
#include "../entities/storage_entity.h"
#include <QString> #include <QString>
#include <QFile> #include <QFile>
#include <QDataStream> #include <QDataStream>
#include "../entities/vessel_entity.h"
#include "../entities/storage_entity.h"
class apparatus class apparatus
{ {
@ -24,8 +24,7 @@ private:
auth_system _auth_system; auth_system _auth_system;
object_system _object_system; object_system _object_system;
void open_reading_stream(); void open_stream();
void open_writing_stream();
void close_stream(); void close_stream();
void writeGIDS(); void writeGIDS();