layter
/
neroshop
mirror of https://github.com/layters/testshop
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

change file directories

Browse Source
pull/227/head
larteyoh 4 months ago
parent a4ade78a05
commit ab59412294
6 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File

4
qml/components/ProductDialog.qml
Unescape View File

@ -277,7 +277,7 @@ Popup {
Text {
anchors.left: parent.left
anchors.verticalCenter: quantityPerOrderField.verticalCenter
text: qsTr("Limit quantity per order")
text: qsTr("Quantity per order")
color: productDialog.palette.text
font.pointSize: 10
}
@ -285,7 +285,7 @@ Popup {
id: quantityPerOrderField
anchors.right: parent.right
width: 50; height: 25
placeholderText: qsTr("#")
placeholderText: qsTr("max")
font.pixelSize: 12
color: productDialog.inputTextColor
selectByMouse: true

2
src/core/tools/logger.cpp
Unescape View File

@ -8,7 +8,7 @@
#include "../../neroshop_config.hpp"
void neroshop::logger(log_priority priority, const std::string& message) {
std::string config_path = NEROSHOP_DATA_DIRECTORY_PATH;
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string log_path = config_path + "/" + NEROSHOP_LOG_FILENAME;
std::ofstream file(std::string(log_path).c_str(), std::ios_base::app);

16
src/gui/backend.cpp
Unescape View File

@ -279,8 +279,8 @@ bool neroshop::Backend::hasSubCategory(int category_id) const {
//----------------------------------------------------------------
bool neroshop::Backend::saveAvatarImage(const QString& fileName, const QString& userAccountKey) {
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string cache_folder = config_path + "/" + NEROSHOP_CACHE_FOLDER_NAME;
std::string avatars_folder = cache_folder + "/" + NEROSHOP_AVATAR_FOLDER_NAME;
std::string data_folder = config_path + "/" + NEROSHOP_DATA_FOLDER_NAME;
std::string avatars_folder = data_folder + "/" + NEROSHOP_AVATAR_FOLDER_NAME;
//----------------------------------------
std::string image_file = fileName.toStdString(); // Full path with file name
std::string image_name = image_file.substr(image_file.find_last_of("\\/") + 1);// get filename from path (complete base name)
@ -335,8 +335,8 @@ bool neroshop::Backend::saveAvatarImage(const QString& fileName, const QString&
//----------------------------------------------------------------
bool neroshop::Backend::saveProductThumbnail(const QString& fileName, const QString& listingKey) {
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string cache_folder = config_path + "/" + NEROSHOP_CACHE_FOLDER_NAME;
std::string listings_folder = cache_folder + "/" + NEROSHOP_CATALOG_FOLDER_NAME;
std::string data_folder = config_path + "/" + NEROSHOP_DATA_FOLDER_NAME;
std::string listings_folder = data_folder + "/" + NEROSHOP_CATALOG_FOLDER_NAME;
//----------------------------------------
// datastore/listings/<listing_key>
std::string key_folder = listings_folder + "/" + listingKey.toStdString();
@ -396,8 +396,8 @@ bool neroshop::Backend::saveProductThumbnail(const QString& fileName, const QStr
//----------------------------------------------------------------
bool neroshop::Backend::saveProductImage(const QString& fileName, const QString& listingKey) {
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string cache_folder = config_path + "/" + NEROSHOP_CACHE_FOLDER_NAME;
std::string listings_folder = cache_folder + "/" + NEROSHOP_CATALOG_FOLDER_NAME;
std::string data_folder = config_path + "/" + NEROSHOP_DATA_FOLDER_NAME;
std::string listings_folder = data_folder + "/" + NEROSHOP_CATALOG_FOLDER_NAME;
//----------------------------------------
std::string image_file = fileName.toStdString(); // Full path with file name
std::string image_name = image_file.substr(image_file.find_last_of("\\/") + 1);// get filename from path (complete base name)
@ -1735,7 +1735,7 @@ QVariantList neroshop::Backend::registerUser(WalletController* wallet_controller
}
//---------------------------------------------
// Generate RSA key pair (this is for sending/receiving encrypted messages)
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string config_path = NEROSHOP_DEFAULT_KEYS_PATH;
std::string public_key_filename = config_path + "/" + primary_address + ".pub";
std::string private_key_filename = config_path + "/" + primary_address + ".key";
EVP_PKEY * pkey = neroshop::crypto::rsa_generate_keys_get();
@ -1850,7 +1850,7 @@ int neroshop::Backend::loginWithWalletFile(WalletController* wallet_controller,
}
//----------------------------------------
// Load RSA keys from file
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string config_path = NEROSHOP_DEFAULT_KEYS_PATH;
std::string public_key_path = config_path + "/" + primary_address + ".pub";
std::string private_key_path = config_path + "/" + primary_address + ".key";
//----------------------------------------

8
src/gui/image_loader.cpp
Unescape View File

@ -106,8 +106,8 @@ QImage ImageLoader::load(const QString &id) const
QString ImageLoader::getProductImagePath(const QString& listing_key, const QString& image_name) const {
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string cache_folder = config_path + "/" + NEROSHOP_CACHE_FOLDER_NAME;
std::string listings_folder = cache_folder + "/" + NEROSHOP_CATALOG_FOLDER_NAME;
std::string data_folder = config_path + "/" + NEROSHOP_DATA_FOLDER_NAME;
std::string listings_folder = data_folder + "/" + NEROSHOP_CATALOG_FOLDER_NAME;
std::string listing_key_folder = listings_folder + "/" + listing_key.toStdString();
std::string product_image = listing_key_folder + "/" + image_name.toStdString();
@ -117,8 +117,8 @@ QString ImageLoader::getProductImagePath(const QString& listing_key, const QStri
QString ImageLoader::getAvatarImagePath(const QString& user_key, const QString& image_name) const {
std::string config_path = NEROSHOP_DEFAULT_CONFIGURATION_PATH;
std::string cache_folder = config_path + "/" + NEROSHOP_CACHE_FOLDER_NAME;
std::string avatars_folder = cache_folder + "/" + NEROSHOP_AVATAR_FOLDER_NAME;
std::string data_folder = config_path + "/" + NEROSHOP_DATA_FOLDER_NAME;
std::string avatars_folder = data_folder + "/" + NEROSHOP_AVATAR_FOLDER_NAME;
std::string user_key_folder = avatars_folder + "/" + user_key.toStdString();
std::string avatar_image = user_key_folder + "/" + image_name.toStdString();

13
src/gui/main.cpp
Unescape View File

@ -79,8 +79,8 @@ int main(int argc, char *argv[])
neroshop::print("\033[1;91mnetwork_type \"" + network_type + "\" is not valid");
return 1;
}
// create neroshop config directory
std::string data_dir = NEROSHOP_DATA_DIRECTORY_PATH;
// create "datastore" folder within "~/.config/neroshop/" path
std::string data_dir = NEROSHOP_DEFAULT_DATABASE_PATH;
if(!neroshop::filesystem::is_directory(data_dir)) {
neroshop::print(std::string("Creating directory \"") + data_dir + "\"", 3);
if(!neroshop::filesystem::make_directory(data_dir)) {
@ -88,6 +88,15 @@ int main(int argc, char *argv[])
return 1;
}
}
// create "keys" folder within "~/.config/neroshop/" path
std::string keys_dir = NEROSHOP_DEFAULT_KEYS_PATH;
if(!neroshop::filesystem::is_directory(keys_dir)) {
neroshop::print(std::string("Creating directory \"") + keys_dir + "\"", 3);
if(!neroshop::filesystem::make_directory(keys_dir)) {
throw std::runtime_error("Failed to create neroshop keys dir");
return 1;
}
}
// start database
Backend::initializeDatabase();
// testing

23
src/neroshop_config.hpp
Unescape View File

@ -64,14 +64,15 @@
#define NEROSHOP_NODES_FILENAME "nodes.lua"
#define NEROSHOP_LOG_FILENAME "neroshop.log"
#define NEROSHOP_CACHE_FOLDER_NAME "datastore"
#define NEROSHOP_KEYS_FOLDER_NAME "keys"
#define NEROSHOP_DATA_FOLDER_NAME "datastore"
#define NEROSHOP_CATALOG_FOLDER_NAME "listings"
#define NEROSHOP_AVATAR_FOLDER_NAME "avatars"
#if defined(NEROSHOP_USE_QT)
#define NEROSHOP_DATA_DIRECTORY_PATH QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toStdString()//(QStandardPaths::AppLocalDataLocation).toStdString()
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH NEROSHOP_DATA_DIRECTORY_PATH
#define NEROSHOP_DEFAULT_DATABASE_PATH NEROSHOP_DATA_DIRECTORY_PATH
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation).toStdString()//(QStandardPaths::AppLocalDataLocation).toStdString()
#define NEROSHOP_DEFAULT_DATABASE_PATH NEROSHOP_DEFAULT_CONFIGURATION_PATH + "/" + NEROSHOP_DATA_FOLDER_NAME
#define NEROSHOP_DEFAULT_KEYS_PATH NEROSHOP_DEFAULT_CONFIGURATION_PATH + "/" + NEROSHOP_KEYS_FOLDER_NAME
#if defined(_WIN32)
#define NEROSHOP_DEFAULT_WALLET_DIRECTORY_PATH (QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation) + "/neroshop").toStdString()
#else
@ -81,32 +82,32 @@
#if !defined(NEROSHOP_USE_QT)
#if defined(_WIN32)
#define NEROSHOP_DATA_DIRECTORY_PATH "C:/Users/" + neroshop::device::get_user() + "/AppData/Local/neroshop"//"C:/ProgramData/neroshop"
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH "C:/Users/" + neroshop::device::get_user() + "/AppData/Local/neroshop"//"C:/ProgramData/neroshop"
#define NEROSHOP_DEFAULT_WALLET_DIRECTORY_PATH "C:/Users/" + neroshop::device::get_user() + "/Documents" + "/neroshop"
#endif
#if defined(__linux__) && !defined(__ANDROID__)
#define NEROSHOP_DATA_DIRECTORY_PATH "/home/" + neroshop::device::get_user() + "/.config/neroshop"//"/etc/xdg/neroshop"//"/home/" + neroshop::device::get_user() + "/.local/share/neroshop"
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH "/home/" + neroshop::device::get_user() + "/.config/neroshop"//"/etc/xdg/neroshop"//"/home/" + neroshop::device::get_user() + "/.local/share/neroshop"
#define NEROSHOP_DEFAULT_WALLET_DIRECTORY_PATH "/home/" + neroshop::device::get_user() + "/neroshop"
#endif
#if defined(__APPLE__) && defined(__MACH__)
#define NEROSHOP_DATA_DIRECTORY_PATH "~/Library/Preferences/neroshop"
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH "~/Library/Preferences/neroshop"
#endif
#if defined(__ANDROID__)
#define NEROSHOP_DATA_DIRECTORY_PATH "<APPROOT>/files/settings"
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH "<APPROOT>/files/settings"
#endif
#if defined(__APPLE__)
#include <TargetConditionals.h>
#if TARGET_OS_IPHONE
#define NEROSHOP_DATA_DIRECTORY_PATH "<APPROOT>/Library/Preferences/neroshop"
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH "<APPROOT>/Library/Preferences/neroshop"
#endif
#endif
#define NEROSHOP_DEFAULT_CONFIGURATION_PATH NEROSHOP_DATA_DIRECTORY_PATH
#define NEROSHOP_DEFAULT_DATABASE_PATH NEROSHOP_DATA_DIRECTORY_PATH
#define NEROSHOP_DEFAULT_DATABASE_PATH NEROSHOP_DEFAULT_CONFIGURATION_PATH + "/" + NEROSHOP_DATA_FOLDER_NAME
#define NEROSHOP_DEFAULT_KEYS_PATH NEROSHOP_DEFAULT_CONFIGURATION_PATH + "/" + NEROSHOP_KEYS_FOLDER_NAME
#endif // endif NOT NEROSHOP_USE_QT
namespace neroshop {

Write Preview
Loading…
Cancel
Save