From 09be71c9ec6685f77f43a3d2eeaf0bd08bf0a97c Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Sun, 30 Sep 2018 17:38:38 +0300
Subject: [PATCH] fix #75
---
CQtDeployer | 2 +-
QuasarAppLib | 2 +-
SoundBand.pro | 4 ++--
Sync/Sync.pro | 1 +
Sync/config.h | 5 ++---
Sync/exaptions.cpp | 1 +
Sync/mysql.cpp | 22 +++++++++-------------
Sync/player.cpp | 3 +--
Sync/player.h | 3 +--
Sync/sync.cpp | 2 +-
10 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/CQtDeployer b/CQtDeployer
index 7492728..56a93aa 160000
--- a/CQtDeployer
+++ b/CQtDeployer
@@ -1 +1 @@
-Subproject commit 7492728b745ec644f8abe6af002de1aeba1e8518
+Subproject commit 56a93aaf65cbf04ac06f400473563b95262ceec5
diff --git a/QuasarAppLib b/QuasarAppLib
index 381518d..745a66b 160000
--- a/QuasarAppLib
+++ b/QuasarAppLib
@@ -1 +1 @@
-Subproject commit 381518d52a122f6892e12d8480de40d61ed44e2c
+Subproject commit 745a66bd5bc9c0f9bd2f0add1e35a3b00f7d70a0
diff --git a/SoundBand.pro b/SoundBand.pro
index 4f48b18..5ed221a 100644
--- a/SoundBand.pro
+++ b/SoundBand.pro
@@ -7,8 +7,8 @@ message( DEPLOY_FILES_MASTER = $$DEPLOY_FILES)
ENABLE_SNAP = 0 #only linux
ENABLE_INSTALLER = 1 #only desctop
-SUBDIRS += Sync \
- QuasarAppLib/QuasarApp.pro \
+SUBDIRS += QuasarAppLib/QuasarApp.pro \
+ Sync \
SoundBand \
CQtDeployer \
tests
diff --git a/Sync/Sync.pro b/Sync/Sync.pro
index 15e7d6a..d5a279a 100644
--- a/Sync/Sync.pro
+++ b/Sync/Sync.pro
@@ -9,6 +9,7 @@ TARGET = Sync
TEMPLATE = lib
include($$PWD/../deploy.pri);
+include('$$PWD/../QuasarAppLib/QuasarLib.pri');
DISTFILES += \
sql/InitLacaleDataBase.sql
diff --git a/Sync/config.h b/Sync/config.h
index dbefcbf..f260102 100644
--- a/Sync/config.h
+++ b/Sync/config.h
@@ -4,7 +4,7 @@
// general otions
#define CURRENT_PLAYLIST_KEY "currentPlayList"
#define MAIN_FOLDER_KEY "songsfolder"
-#define MAIN_FOLDER "soundBand"
+#define MAIN_FOLDER QDir::homePath() + "/soundBand"
// LIB VERSION
@@ -14,7 +14,6 @@
// sqlite config
#define DATABASE_NAME "songdata.dat"
-#define BUFFER_NAME "buffer"
#define ALL_SONGS_LIST "all songs"
// network config
@@ -37,5 +36,5 @@
#endif
#define LOGER // define this macros if want use logs
-#define LOG_FILE "logs.log"
+#define LOG_FILE MAIN_FOLDER + "/logs.log"
#endif // CONFIG_H
diff --git a/Sync/exaptions.cpp b/Sync/exaptions.cpp
index be4cffd..458b00b 100644
--- a/Sync/exaptions.cpp
+++ b/Sync/exaptions.cpp
@@ -1,4 +1,5 @@
#include "exaptions.h"
+#include <QDir>
#ifdef LOGER
Log debug_log(LOG_FILE);
diff --git a/Sync/mysql.cpp b/Sync/mysql.cpp
index 8628801..d7d58d6 100644
--- a/Sync/mysql.cpp
+++ b/Sync/mysql.cpp
@@ -45,10 +45,10 @@ void MySql::initDB(const QString &database){
if(db) return;
dataBaseName = database;
QSettings settings;
- songDir = settings.value(MAIN_FOLDER_KEY, QDir::homePath() + "/soundBand").toString();
+ songDir = settings.value(MAIN_FOLDER_KEY, MAIN_FOLDER).toString();
db = new QSqlDatabase();
*db = QSqlDatabase::addDatabase("QSQLITE", database);
- QDir d(QString("./%0").arg(dataBaseName));
+ QDir d(MAIN_FOLDER + "/" + dataBaseName);
db->setDatabaseName(d.absolutePath());
if(db->open()){
qyery = new QSqlQuery(*db);
@@ -60,19 +60,18 @@ void MySql::initDB(const QString &database){
"data TEXT NOT NULL "
")");
if(!qyery->exec(qyer)){
+
sqlErrorLog(qyer);
- throw InitDBError();
delete db;
- return;
+ throw InitDBError();
}
qyer = QString("CREATE UNIQUE INDEX IF NOT EXISTS isongs ON songs(name,size)");
if(!qyery->exec(qyer)){
sqlErrorLog(qyer);
- throw InitDBError();
delete db;
- return;
+ throw InitDBError();
}
qyer = QString("CREATE TABLE IF NOT EXISTS playlists("
@@ -83,9 +82,8 @@ void MySql::initDB(const QString &database){
")");
if(!qyery->exec(qyer)){
sqlErrorLog(qyer);
- throw InitDBError();
delete db;
- return;
+ throw InitDBError();
}
qyer = QString("CREATE TABLE IF NOT EXISTS playlistsdata("
@@ -100,18 +98,16 @@ void MySql::initDB(const QString &database){
")");
if(!qyery->exec(qyer)){
sqlErrorLog(qyer);
- throw InitDBError();
delete db;
- return;
+ throw InitDBError();
}
qyer = QString("CREATE UNIQUE INDEX IF NOT EXISTS iplaylistsdata ON "
"playlistsdata(playlist,song)");
if(!qyery->exec(qyer)){
sqlErrorLog(qyer);
- throw InitDBError();
delete db;
- return;
+ throw InitDBError();
}
}
@@ -125,7 +121,7 @@ bool MySql::find(const SongHeader &song, SongStorage &response){
}
for(SongStorage &i: songs){
- if((SongHeader&)i == song){
+ if(static_cast<SongHeader&>(i) == song){
response = i;
return true;
}
diff --git a/Sync/player.cpp b/Sync/player.cpp
index 05fa849..4010d98 100644
--- a/Sync/player.cpp
+++ b/Sync/player.cpp
@@ -5,10 +5,9 @@
#include <QDir>
-Player::Player(const QString &bufferFile, QObject *parent, Flags flags):
+Player::Player(QObject *parent, Flags flags):
QMediaPlayer(parent, flags)
{
- buffer = bufferFile;
bufferVolume = 0;
}
diff --git a/Sync/player.h b/Sync/player.h
index d5077c5..185350b 100644
--- a/Sync/player.h
+++ b/Sync/player.h
@@ -11,7 +11,6 @@ class Player : public QMediaPlayer
{
Q_OBJECT
private:
- QString buffer;
milliseconds playDelay;
QMediaPlayer::State predState;
int bufferVolume;
@@ -19,7 +18,7 @@ private:
public:
- Player(const QString& bufferFile, QObject *parent = Q_NULLPTR, Flags flags = Flags());
+ Player( QObject *parent = Q_NULLPTR, Flags flags = Flags());
/**
* @brief syncBegin - palyer waiting for sunced.
diff --git a/Sync/sync.cpp b/Sync/sync.cpp
index cb5d561..a491763 100644
--- a/Sync/sync.cpp
+++ b/Sync/sync.cpp
@@ -16,7 +16,7 @@ Sync::Sync(const QString &address, int port, const QString &datadir):
{
node = new Node(address , this->port = port);
- player = new Player(BUFFER_NAME,nullptr,QMediaPlayer::LowLatency);
+ player = new Player(nullptr, QMediaPlayer::LowLatency);
if(!player->isAvailable()){
throw MediaException();
}