diff --git a/prerequisites/qbs/imports/SQLiteArtifactsExport.qbs b/prerequisites/qbs/imports/SQLiteArtifactsExport.qbs new file mode 100644 index 0000000..1869fe2 --- /dev/null +++ b/prerequisites/qbs/imports/SQLiteArtifactsExport.qbs @@ -0,0 +1,8 @@ +import qbs + +Export { + Depends { name: "cpp" } + Depends { name: "rsc.sqlite.settings" } + + rsc.sqlite.settings.includeRegexValues: exportingProduct.includeRegexValue +} diff --git a/prerequisites/qbs/modules/karchive/karchive.qbs b/prerequisites/qbs/modules/karchive/karchive.qbs new file mode 100644 index 0000000..fae3d7e --- /dev/null +++ b/prerequisites/qbs/modules/karchive/karchive.qbs @@ -0,0 +1,53 @@ +import qbs + +Module { + id: karchive + + readonly property string karchive_path: project.sourceDirectory + "/external_libs/karchive" + readonly property string libKF5ArchivePath: karchive.karchive_path + "/lib" + + (qbs.buildVariant == "release" ? "/Release" : "/Debug") + property bool installFiles: true + + Depends { name: "glob" } + Depends { name: "cpp" } + Depends { name: "zlib" } + + Properties + { + condition: qbs.targetOS.contains("linux") || qbs.targetOS.contains("astra") + cpp.includePaths: [ karchive.karchive_path + "/include/lin" ] + cpp.libraryPaths: [ karchive.libKF5ArchivePath + "/lin" ] + cpp.dynamicLibraries: "KF5Archive" + } + + Properties { + condition: qbs.targetOS.contains("windows") + cpp.includePaths: [ karchive.karchive_path + "/include/win" ] + cpp.libraryPaths: [ karchive.libKF5ArchivePath + "/win" ] + cpp.dynamicLibraries: "KF5Archive" + } + + InstallGroup { + name: "karchive_lin" + condition: qbs.targetOS.contains("linux") || qbs.targetOS.contains("astra") + files: [ + karchive.libKF5ArchivePath + "/lin/libKF5Archive.so", + karchive.libKF5ArchivePath + "/lin/libKF5Archive.so.5", + karchive.libKF5ArchivePath + "/lin/libKF5Archive.so.5.108.0" + ] + qbs.install: karchive.installFiles + qbs.installDir: glob.binInstallPrefix + } + + InstallGroup { + name: "karchive_win" + condition: qbs.targetOS.contains("windows") + files: [ + karchive.libKF5ArchivePath + "/win/KF5Archive.dll", + karchive.libKF5ArchivePath + "/win/KF5Archive.lib" + ] + qbs.install: karchive.installFiles + qbs.installDir: glob.binInstallPrefix + } + zlib.installFiles: true +} diff --git a/project.qbs b/project.qbs index 381658f..d717770 100644 --- a/project.qbs +++ b/project.qbs @@ -6,9 +6,13 @@ Project { "redkitty/qbs", "redkbuild", "redkitty/lib/redkit-gen-integration/qbs", + "prerequisites/qbs", ] references: [ + "redkitty/lib/rsc/libs_impl/rdbaseimpl/rdbaseimpl.qbs", + "redkitty/lib/rcore/rcore.qbs", + "src/cpp-opds.qbs", "src/database/database.qbs", "src/restapi/restapi.qbs", diff --git a/src/cpp-opds.qbs b/src/cpp-opds.qbs index 1db962c..ae24c6d 100644 --- a/src/cpp-opds.qbs +++ b/src/cpp-opds.qbs @@ -20,6 +20,7 @@ PSApplication { Depends { name: "sqlite3" } Depends { name: "restapi" } Depends { name: "redkit_gen" } + Depends { name: "rdbase" } cpp.cxxLanguageVersion: "c++20" diff --git a/src/database/book_s.h b/src/database/book_s.h index bb5d559..ec9d066 100644 --- a/src/database/book_s.h +++ b/src/database/book_s.h @@ -6,10 +6,10 @@ #include "database_global.h" -#include #include - +#include #include +#include #include "author_s.h" @@ -19,8 +19,8 @@ class DATABASE_EXPORT Book_S public: Book_S() = default; - Book_S(const QString & name, - const QSharedPointer& author, + Book_S(const QString& name, + const SH& author, const int year) { m_author = author; @@ -29,8 +29,8 @@ public: }; unsigned long long id() const { return m_id; } - QSharedPointer author() const { return m_author; } - QString name() const { return m_name; } + SH author() const { return m_author; } + QString name() const { return m_name; } int year() const { return m_year; } private: @@ -40,8 +40,8 @@ private: #pragma db id auto unsigned long long m_id; - QSharedPointer m_author; - QString m_name; + SH m_author; + QString m_name; int m_year; }; diff --git a/src/database/database.hxx b/src/database/database.hxx index 9e43499..a33e812 100644 --- a/src/database/database.hxx +++ b/src/database/database.hxx @@ -34,19 +34,20 @@ #include #include +#include -using odatabase = odb::sqlite::database; -using unidb = std::unique_ptr; +using oDBase = odb::sqlite::database; +using uDBase = U; struct testData { - std::string first; - std::string last; + QString first; + QString last; int age; }; // Функция для генерации случайной строки (имени или фамилии) -std::string generate_random_string(const std::vector& pool) +QString generate_random_string(const QVector& pool) { static std::random_device rd; static std::mt19937 gen(rd()); @@ -63,16 +64,16 @@ int generate_random_year(int min_year = 1900, int max_year = 2020) return dis(gen); } -std::vector fillDB() +QVector fillDB() { - std::vector first_names = { + QVector first_names = { "John", "Jane", "Alex", "Chris", "Robert", "Emily", "James", "Linda", "David", "Sarah", "Michael", "Elizabeth", "Daniel", "Samantha", "William", "Olivia", "Ethan", "Sophia", "Joshua", "Charlotte", "Daniel", "Grace", "Benjamin", "Isabella", "Matthew", "Victoria", "Henry", "Abigail", "Samuel", "Megan", "Lucas", "Lily", "Andrew", "Madison", "Jackson", "Chloe", "Aiden", "Amelia", "Thomas", "Natalie", "Ryan", "Zoe", "Jack", "Harper", "Elijah", "Ava", "Isaac", "Mia", "Caleb", "Ella" }; - std::vector last_names = { + QVector last_names = { "Doe", "Smith", "Johnson", "Williams", "Jones", "Brown", "Davis", "Miller", "Wilson", "Moore", "Taylor", "Anderson", "Thomas", "Jackson", "White", "Harris", "Martin", "Thompson", "Garcia", "Martinez", "Roberts", "Clark", "Lewis", "Walker", "Young", "Allen", "King", "Wright", "Scott", "Adams", @@ -80,12 +81,12 @@ std::vector fillDB() "Rogers", "Gutierrez", "Ramirez", "Diaz", "Perez", "Ross", "Sanders", "Price", "Howard", "Cooper" }; - std::vector vecTest; + QVector vecTest; for (int i = 0; i < 50; ++i) { - std::string first_name = generate_random_string(first_names); - std::string last_name = generate_random_string(last_names); + QString first_name = generate_random_string(first_names); + QString last_name = generate_random_string(last_names); int birth_year = generate_random_year(1900, 2000); vecTest.push_back({ first_name, last_name, birth_year }); @@ -94,16 +95,16 @@ std::vector fillDB() return vecTest; } -inline unidb openDB(const std::string path_db) +inline uDBase openDB(const std::string path_db) { // Открыть БД, если она существует - auto db_ptr = new odatabase(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE); + auto db_ptr = new oDBase(path_db, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE); if (std::filesystem::is_regular_file(path_db)) - return unidb(db_ptr); + return uDBase(db_ptr); // И создать новую, если не существует - unidb db(db_ptr); + uDBase db(db_ptr); odb::connection_ptr connect_ptr(db->connection()); diff --git a/src/database/database.qbs b/src/database/database.qbs index ba173c0..f202fa9 100644 --- a/src/database/database.qbs +++ b/src/database/database.qbs @@ -17,6 +17,7 @@ PSLibrary { Depends { name: "cpp" } Depends { name: "odb.gen" } Depends { name: "redkit_gen" } + Depends { name: "rdbase" } odb.gen.databases: "sqlite" cpp.cxxLanguageVersion: "c++17" diff --git a/src/main.cpp b/src/main.cpp index 224b3c9..72d6b4a 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2,6 +2,8 @@ #include #include +#include +#include #include @@ -15,30 +17,30 @@ #include -void fillBooksBD(unidb& db) +void fillBooksBD(uDBase& db) { try { - std::vector> authors = { - QSharedPointer::create("George", "Orwell", 142), - QSharedPointer::create("J.K.", "Rowling", 56), - QSharedPointer::create("J.R.R.", "Tolkien", 81), - QSharedPointer::create("Leo", "Tolstoy", 189), - QSharedPointer::create("Fyodor", "Dostoevsky", 174), - QSharedPointer::create("Mark", "Twain", 183), - QSharedPointer::create("Charles", "Dickens", 208), - QSharedPointer::create("Virginia", "Woolf", 134), - QSharedPointer::create("Ernest", "Hemingway", 122), - QSharedPointer::create("Gabriel", "García Márquez", 98), - QSharedPointer::create("Franz", "Kafka", 100), - QSharedPointer::create("Harper", "Lee", 64), - QSharedPointer::create("William", "Shakespeare", 459), - QSharedPointer::create("Oscar", "Wilde", 155), - QSharedPointer::create("Aldous", "Huxley", 123), - QSharedPointer::create("Jane", "Austen", 210), - QSharedPointer::create("John", "Steinbeck", 116), - QSharedPointer::create("Agatha", "Christie", 124), - QSharedPointer::create("Isaac", "Asimov", 105) + QVector> authors = { + SH::create("George", "Orwell", 142), + SH::create("J.K.", "Rowling", 56), + SH::create("J.R.R.", "Tolkien", 81), + SH::create("Leo", "Tolstoy", 189), + SH::create("Fyodor", "Dostoevsky", 174), + SH::create("Mark", "Twain", 183), + SH::create("Charles", "Dickens", 208), + SH::create("Virginia", "Woolf", 134), + SH::create("Ernest", "Hemingway", 122), + SH::create("Gabriel", "García Márquez", 98), + SH::create("Franz", "Kafka", 100), + SH::create("Harper", "Lee", 64), + SH::create("William", "Shakespeare", 459), + SH::create("Oscar", "Wilde", 155), + SH::create("Aldous", "Huxley", 123), + SH::create("Jane", "Austen", 210), + SH::create("John", "Steinbeck", 116), + SH::create("Agatha", "Christie", 124), + SH::create("Isaac", "Asimov", 105) }; // Список книг @@ -124,7 +126,7 @@ int main(int argc, char* argv[]) QCoreApplication a(argc, argv); const std::string dbPath = "test_db.sqlite"; - unidb db(openDB(dbPath)); + uDBase db(openDB(dbPath)); fillBooksBD(db); diff --git a/src/restapi/restapi.qbs b/src/restapi/restapi.qbs index ea4c7a5..37ccfa9 100644 --- a/src/restapi/restapi.qbs +++ b/src/restapi/restapi.qbs @@ -17,6 +17,7 @@ WPSLibrary { Depends { name: "database" } Depends { name: "odb.gen" } Depends { name: "redkit_gen" } + Depends { name: "rdbase" } cpp.cxxLanguageVersion: "c++20" diff --git a/src/restapi/restapiserver.cpp b/src/restapi/restapiserver.cpp index 30ad780..152a547 100644 --- a/src/restapi/restapiserver.cpp +++ b/src/restapi/restapiserver.cpp @@ -25,7 +25,8 @@ void RestApiServer::start(quint16 port) } else { - qDebug() << "REST API сервер запущен на порту:" << port; + QString addrs = "http://127.0.0.1:" + QString::number(this->serverPort()); + qDebug() << "REST API сервер запущен по адресу:" << addrs; } } @@ -36,6 +37,8 @@ void RestApiServer::incomingConnection(qintptr socketDescriptor) connect(socket, &QTcpSocket::readyRead, this, &RestApiServer::handleRequest); connect(socket, &QTcpSocket::disconnected, socket, &QTcpSocket::deleteLater); + + qWarning() << "Есть входящее подключение" << socket->socketDescriptor(); } void RestApiServer::handleRequest() @@ -59,7 +62,8 @@ QByteArray RestApiServer::processRequest(const QString& request) QString author = request.section(' ', 1, 1).section('/', 3, 3).replace("%20", " "); qWarning() << "THIS"; - // Books books; + odb::transaction t(m_db.begin()); + odb::result res(m_db.query()); // QList results = books.getBooksByAuthor(author); QByteArray jsonResponse = "{ \"books\": [";