diff --git a/SoundBand.pro b/SoundBand.pro
index 5ed221a..702bd50 100644
--- a/SoundBand.pro
+++ b/SoundBand.pro
@@ -10,9 +10,12 @@ ENABLE_INSTALLER = 1 #only desctop
SUBDIRS += QuasarAppLib/QuasarApp.pro \
Sync \
SoundBand \
- CQtDeployer \
tests
+unix:!android:{
+ SUBDIRS += CQtDeployer
+}
+
SoundBand.depends = Sync QuasarAppLib/QuasarApp.pro
equals( ENABLE_INSTALLER, 1) {
diff --git a/SoundBand/SoundBand.pro b/SoundBand/SoundBand.pro
index fbead90..d94c4aa 100644
--- a/SoundBand/SoundBand.pro
+++ b/SoundBand/SoundBand.pro
@@ -41,7 +41,14 @@ qnx: target.path = /tmp/$${TARGET}/bin
else: unix:!android: target.path = /opt/$${TARGET}/bin
!isEmpty(target.path): INSTALLS += target
-DISTFILES +=
+DISTFILES += \
+ android/AndroidManifest.xml \
+ android/gradle/wrapper/gradle-wrapper.jar \
+ android/gradlew \
+ android/res/values/libs.xml \
+ android/build.gradle \
+ android/gradle/wrapper/gradle-wrapper.properties \
+ android/gradlew.bat
HEADERS += \
syncengine.h \
@@ -56,4 +63,6 @@ include($$PWD/../deploy.pri)
include($$PWD/../Sync/Sync.pri)
include('$$PWD/../QuasarAppLib/QuasarLib.pri');
-QMAKE_LFLAGS += -Wl,-rpath,"'$$DESTDIR'"
+ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
+
+
diff --git a/SoundBand/android/AndroidManifest.xml b/SoundBand/android/AndroidManifest.xml
new file mode 100644
index 0000000..009366e
--- /dev/null
+++ b/SoundBand/android/AndroidManifest.xml
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SoundBand/android/build.gradle b/SoundBand/android/build.gradle
new file mode 100644
index 0000000..3a3e0cd
--- /dev/null
+++ b/SoundBand/android/build.gradle
@@ -0,0 +1,57 @@
+buildscript {
+ repositories {
+ jcenter()
+ }
+
+ dependencies {
+ classpath 'com.android.tools.build:gradle:2.2.3'
+ }
+}
+
+allprojects {
+ repositories {
+ jcenter()
+ }
+}
+
+apply plugin: 'com.android.application'
+
+dependencies {
+ compile fileTree(dir: 'libs', include: ['*.jar'])
+}
+
+android {
+ /*******************************************************
+ * The following variables:
+ * - androidBuildToolsVersion,
+ * - androidCompileSdkVersion
+ * - qt5AndroidDir - holds the path to qt android files
+ * needed to build any Qt application
+ * on Android.
+ *
+ * are defined in gradle.properties file. This file is
+ * updated by QtCreator and androiddeployqt tools.
+ * Changing them manually might break the compilation!
+ *******************************************************/
+
+ compileSdkVersion androidCompileSdkVersion.toInteger()
+
+ buildToolsVersion androidBuildToolsVersion
+
+ sourceSets {
+ main {
+ manifest.srcFile 'AndroidManifest.xml'
+ java.srcDirs = [qt5AndroidDir + '/src', 'src', 'java']
+ aidl.srcDirs = [qt5AndroidDir + '/src', 'src', 'aidl']
+ res.srcDirs = [qt5AndroidDir + '/res', 'res']
+ resources.srcDirs = ['src']
+ renderscript.srcDirs = ['src']
+ assets.srcDirs = ['assets']
+ jniLibs.srcDirs = ['libs']
+ }
+ }
+
+ lintOptions {
+ abortOnError false
+ }
+}
diff --git a/SoundBand/android/gradle/wrapper/gradle-wrapper.jar b/SoundBand/android/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..2b338a9
Binary files /dev/null and b/SoundBand/android/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/SoundBand/android/gradle/wrapper/gradle-wrapper.properties b/SoundBand/android/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..4244097
--- /dev/null
+++ b/SoundBand/android/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,6 @@
+#Mon Feb 20 10:43:22 EST 2017
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.4-bin.zip
diff --git a/SoundBand/android/gradlew b/SoundBand/android/gradlew
new file mode 100755
index 0000000..eeff5cc
--- /dev/null
+++ b/SoundBand/android/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS="-Xmx1024m -Dfile.encoding=UTF-8"
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn ( ) {
+ echo "$*"
+}
+
+die ( ) {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save ( ) {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/SoundBand/android/gradlew.bat b/SoundBand/android/gradlew.bat
new file mode 100644
index 0000000..65b35a4
--- /dev/null
+++ b/SoundBand/android/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=-Xmx1024m -Dfile.encoding=UTF-8
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/SoundBand/android/res/drawable-hdpi/icon.png b/SoundBand/android/res/drawable-hdpi/icon.png
new file mode 100644
index 0000000..9d682c6
Binary files /dev/null and b/SoundBand/android/res/drawable-hdpi/icon.png differ
diff --git a/SoundBand/android/res/drawable-ldpi/icon.png b/SoundBand/android/res/drawable-ldpi/icon.png
new file mode 100644
index 0000000..9d682c6
Binary files /dev/null and b/SoundBand/android/res/drawable-ldpi/icon.png differ
diff --git a/SoundBand/android/res/drawable-mdpi/icon.png b/SoundBand/android/res/drawable-mdpi/icon.png
new file mode 100644
index 0000000..9d682c6
Binary files /dev/null and b/SoundBand/android/res/drawable-mdpi/icon.png differ
diff --git a/SoundBand/android/res/values/libs.xml b/SoundBand/android/res/values/libs.xml
new file mode 100644
index 0000000..4009a77
--- /dev/null
+++ b/SoundBand/android/res/values/libs.xml
@@ -0,0 +1,25 @@
+
+
+
+ - https://download.qt.io/ministro/android/qt5/qt-5.9
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/SoundBand/app.cpp b/SoundBand/app.cpp
index 2a98a19..0ea2b08 100644
--- a/SoundBand/app.cpp
+++ b/SoundBand/app.cpp
@@ -1,4 +1,6 @@
#include "app.h"
+#include
+#include
#include
#include
#include "syncengine.h"
@@ -9,10 +11,16 @@
#include "currentplaylistmodel.h"
#include
#include
+#include
App::App(QObject* ptr):
QObject(ptr)
{
+
+ if (!initAppDir()) {
+ throw initNodeError();
+ }
+
qmlEngine = new QQmlApplicationEngine();
syncEngine = new SyncEngine();
imageProvider = new ImageProvider(syncEngine);
@@ -40,7 +48,7 @@ void App::setIcon()
trayIcon->setToolTip(tr("SoundBand"));
}
-bool App::run(){
+bool App::run() {
qmlEngine->addImageProvider(QLatin1String("collection"), imageProvider);
@@ -61,6 +69,19 @@ bool App::run(){
return syncEngine->init();
}
+bool App::initAppDir() const {
+
+ QDir dir(QDir::rootPath());
+
+ if (!QFileInfo::exists(MAIN_FOLDER) &&
+ !dir.mkpath(MAIN_FOLDER)) {
+
+ return false;
+ }
+
+ return true;
+}
+
App::~App(){
delete playListModel;
delete playListsModel;
diff --git a/SoundBand/app.h b/SoundBand/app.h
index b95a86a..78db075 100644
--- a/SoundBand/app.h
+++ b/SoundBand/app.h
@@ -38,6 +38,12 @@ public:
* @return false if app not running, true if all done
*/
bool run();
+
+ /**
+ * @brief initAppDir
+ * @return true if all done else false
+ */
+ bool initAppDir() const;
~App();
};
diff --git a/Sync/config.h b/Sync/config.h
index f260102..825d661 100644
--- a/Sync/config.h
+++ b/Sync/config.h
@@ -6,7 +6,6 @@
#define MAIN_FOLDER_KEY "songsfolder"
#define MAIN_FOLDER QDir::homePath() + "/soundBand"
-
// LIB VERSION
#define MAJOR_VERSION 0
#define MINOR_VERSION 1
diff --git a/Sync/mysql.cpp b/Sync/mysql.cpp
index ef5608e..53a7afa 100644
--- a/Sync/mysql.cpp
+++ b/Sync/mysql.cpp
@@ -51,7 +51,7 @@ void MySql::initDB(const QString &database){
*db = QSqlDatabase::addDatabase("QSQLITE", database);
QDir d(MAIN_FOLDER + "/" + dataBaseName);
db->setDatabaseName(d.absolutePath());
- if(db->open()){
+ if(db->open()) {
qyery = new QSqlQuery(*db);
QString qyer = QString("CREATE TABLE IF NOT EXISTS songs("
@@ -111,6 +111,10 @@ void MySql::initDB(const QString &database){
throw InitDBError();
}
+ } else {
+ sqlErrorLog("erro on open database! error: " + db->lastError().text());
+ delete db;
+ throw InitDBError();
}
}