32 changed files with 279 additions and 1503 deletions
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@ -1,68 +1,17 @@
+image: luki42/dynuiprefresher_build:latest
+
 stages:
  - build
-  - post

-# Unix Build
+
 build:
  stage: build
-  image: luki42/dynuiprefresher_build:latest
  script:
-    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
-    - cd build
-    - make dynuiprefresher
-  artifacts:
-    paths:
-      - build/bin/
-
-
-build_package:
-  stage: post
-  image: luki42/dynuiprefresher_build:latest
-  script:
-    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
+    - cmake -S . -B build
    - cd build
+    - make
    - make package
  artifacts:
    paths:
-      - build/packages/
-  needs:
-    - build
-
-test:
-  stage: post
-  image: luki42/dynuiprefresher_build:latest
-  script:
-    - cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
-    - cd build
-    - make build-test
-  artifacts:
-    reports:
-      junit: build/*.xml
-  needs:
-    - build
-
-# Windows Build
-build_win64:
-  stage: build
-  image: luki42/dynuiprefresher_build:windows
-  script:
-    - cmake -S . -B build -D WinBuild=ON
-    - cd build
-    - make dynuiprefresher
-  artifacts:
-    paths:
-      - build/bin/
-
-
-build_package_win64:
-  stage: post
-  image: luki42/dynuiprefresher_build:windows
-  script:
-    - cmake -S . -B build -D WinBuild=ON
-    - cd build
-    - make package
-  artifacts:
-    paths:
-      - build/packages/
-  needs:
-    - build_win64
+      - "build/bin/*"
+      - "build/packages/*"
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -5,443 +5,157 @@
 ## libcurl (with sources)
 ## libconfig (with sources)
 #
-# for documenation build doxygen needs to be installed.
-# for test build gtest needs to be installed.
+# documenation build needs doxygen to be installed.

 cmake_minimum_required(VERSION 3.13)
-project(dynuiprefresher DESCRIPTION "Dynu ip refresher" LANGUAGES)
-SET(PROJECT_VERSION 1.3.4)
+project(iprefresher DESCRIPTION "Dynu ip refresher")
+
+SET(CMAKE_CXX_STANDARD 17)

-# CONFIGURATION
 SET(CMAKE_BUILD_TYPE Release) # manually SET build type (Release / Debug)
 SET(LIB_METHOD STATIC) #SHARED / STATIC
-
-option(BUILD_DOC "Build documentation" ON) # additional dependency for Doxygen
-option(PACKAGING "Allow Packaging to <exe>, <deb> or <rpm>" ON) # additional dependencies for RPMbuild,dpkg  or NSIS
-option(TESTS "Build Tests" ON) # additional dependencies for GTEST - to build tests
-option(GUI "Build GUI elements" ON) # additional dependencies to QT libraries needed
-option(WinBuild "cross compile for Windows Platform" ON)
-
-# helper variables
-SET(CMAKE_CXX_STANDARD 17)
-string(TIMESTAMP TIMESTAMP_NOW "%d.%m.%Y")
-SET(Application_Name "dynuiprefresher")
+SET(PROJECT_VERSION 1.3.2)
+option(BUILD_DOC "Build documentation" ON)

 SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)

-# setup winbuild compilers
-if (${WinBuild})
-    message(STATUS "setup Mingw Toolchain for cross compile.")
-    set(LIBSUFFIX .dll)
-    set(SUFFIX .exe)
-
-    set(CMAKE_SYSTEM_NAME WindowsStore)
-    set(CMAKE_SYSTEM_VERSION 10.0)
-    set(TOOLCHAIN_PREFIX x86_64-w64-mingw32) # x64 build toolchain
-    #set(TOOLCHAIN_PREFIX i686-w64-mingw32)
-
-    # cross compilers to use for C and C++
-    set(CMAKE_C_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-gcc)
-    set(CMAKE_CXX_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-g++)
-    set(CMAKE_RC_COMPILER /usr/bin/${TOOLCHAIN_PREFIX}-windres)
-
-    # target environment on the build host system
-    set(CMAKE_FIND_ROOT_PATH /usr/${TOOLCHAIN_PREFIX})
-
-
-    # modify default behavior of FIND_XXX() commands to
-    # search for headers/libs in the target environment and
-    # search for programs in the build host environment
-    set(CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
-    set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-
-    set(CMAKE_CXX_STANDARD_LIBRARIES "${CMAKE_CSS_STANDARD_LIBRARIES}")
-    set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS}")
-    # currently libs are dynamically linked eg. dlls have to be copied to same folder
-    # todo link dynamically.
-    # maybe so: set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++ -static")
-    # or set(CMAKE_CXX_STANDARD_LIBRARIES -lcurl -lpthread -static-libgcc -static-libstdc++ -lcrypto -lssl -lws2_32 -static -DCURL_STATICLIB)
-    # or add_definitions(-DCURL_STATICLIB)
-
-    # windows config path is in %appdata% folder of user
-    set(CONFIG_PATH "std::string(std::getenv(\"USERPROFILE\")) + \"\\\\AppData\\\\Roaming\\\\DynuIPrefresher\\\\\"")
-    # temp file is also stored in appdata folder
-    set(TempFilePath "std::string(std::getenv(\"USERPROFILE\")) + \"\\\\AppData\\\\Roaming\\\\DynuIPrefresher\\\\\"")
-else ()
-    message(STATUS "using nativ gcc toolchain.")
-    set(LIBSUFFIX .so)
-    set(SUFFIX "")
-
-    # set linux config path
-    set(CONFIG_PATH "\"/etc/\"")
-    # set path of temp file
-    set(TempFilePath "\"/var/tmp/\"")
-endif ()
-
-# test compiler settings and enable languages here
-message("")
-message(STATUS "Testing the C++ compiler!")
-enable_language(CXX)
-message("")
-message(STATUS "Testing the C compiler!")
-enable_language(C)
-
 # config libs
-message("")
 message(STATUS "Config of Libraries")
 # libcurl
-if (${WinBuild})
-    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib" ".dll")
-    # configure libcurl
-    FIND_PATH(CURL_INCLUDE_DIRS curl/curl.h /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
-    FIND_LIBRARY(CURL_LIBRARIES NAMES libcurl.dll.a HINTS /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib) # search for actual lib
-
+find_package(CURL REQUIRED)
+if (CURL_FOUND)
+    message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")
    message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
    message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
-    message(STATUS "")
-
-    include_directories(${CURL_INCLUDE_DIRS})
-
-    # configure libconfig
-    FIND_PATH(LIBCONFIG++_INCLUDE_DIRS libconfig.h++ /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/include/) # search for libconfig include headers
-    FIND_LIBRARY(LIBCONFIG++_LIBRARIES NAMES libconfig++.dll.a HINTS /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib) # search for actual lib
-
-    message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
-    message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}")
-
-    if (${GUI})
-        set(CMAKE_PREFIX_PATH "/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib/cmake")
-    endif ()
-
-    include_directories(${LIBCONFIG++_INCLUDE_DIRS})
 else ()
-    find_package(CURL REQUIRED)
-    if (CURL_INCLUDE_DIRS AND CURL_LIBRARIES)
-        message(STATUS "Found CURL version: ${CURL_VERSION_STRING}")
-        message(STATUS "Using CURL include dir(s): ${CURL_INCLUDE_DIRS}")
-        message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
-    else ()
-        message(FATAL_ERROR "Could not find CURL")
-    endif ()
-    include_directories(${CURL_INCLUDE_DIR})
-
-    message("")
-    # libconfig
-    FIND_PATH(LIBCONFIG++_INCLUDE_DIRS
-            NAMES libconfig.h++
-            PATHS /usr/include /usr/local/include) # search for libconfig include headers
-    FIND_LIBRARY(LIBCONFIG++_LIBRARIES
-            NAMES config++
-            PATHS /usr/lib /usr/local/lib) # search for actual lib
-
-    if (LIBCONFIG++_INCLUDE_DIRS AND LIBCONFIG++_LIBRARIES)
-        message(STATUS "Fount libconfig!")
-        message(STATUS "Using libconfig include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
-        message(STATUS "Using libconfig lib(s): ${LIBCONFIG++_LIBRARIES}")
-    else ()
-        message(FATAL_ERROR "Could not find LIBCONFIG")
-    endif ()
-
-    include_directories(${LIBCONFIG_INCLUDE_DIRS})
+    message(FATAL_ERROR "Could not find CURL")
 endif ()
+include_directories(${CURL_INCLUDE_DIR} inc)

+# libconfig
+FIND_PATH(LIBCONFIG_INCLUDE_DIR libconfig.h++ /usr/include /usr/local/include) # search for libconfig include headers
+FIND_LIBRARY(CONFIG++_LIBRARY NAMES config++ PATH /usr/lib /usr/local/lib) # search for actual lib

-if (${GUI})
-    set(CMAKE_AUTOMOC ON)
-    set(CMAKE_INCLUDE_CURRENT_DIR ON)
+IF (CONFIG++_LIBRARY AND LIBCONFIG_INCLUDE_DIR)
+    MESSAGE(STATUS "Found Config++: ${CONFIG++_LIBRARY}")
+ELSE (CONFIG++_LIBRARY AND LIBCONFIG_INCLUDE_DIR)
+    IF (NOT LIBCONFIG_INCLUDE_DIR)
+        MESSAGE(FATAL_ERROR "Could not find LibConfig++ header file! Try to install 'libconfig-devel'")
+    ENDIF (NOT LIBCONFIG_INCLUDE_DIR)

-    find_package(Qt5Widgets REQUIRED)
-    find_package(Qt5PrintSupport REQUIRED)
-    find_package(Qt5Sql REQUIRED)
-endif ()
+    IF (NOT CONFIG++_LIBRARY)
+        MESSAGE(FATAL_ERROR "Could not find LibConfig++ library file! Try to install 'libconfig'")
+    ENDIF (NOT CONFIG++_LIBRARY)
+ENDIF (CONFIG++_LIBRARY AND LIBCONFIG_INCLUDE_DIR)

-include_directories(inc)
+include_directories(${LIBCONFIG_INCLUDE_DIR})

 message("")

 #read sample config
-FILE(READ ${CMAKE_SOURCE_DIR}/config/dynuiprefresher.cfg SAMPLECONFIG)
-#add StaticData header
-FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/StaticData.h
-        "/**
- * StaticData header to store Version, Config dir and a Sample config
- * Do not edit this file manually, it is generated by the cmake script!
- *
- * @author Lukas Heiligenbrunner
- * @date ${TIMESTAMP_NOW}
- */
-
-#pragma once
-
+FILE(READ ${CMAKE_SOURCE_DIR}/config/iprefresher.cfg SAMPLECONFIG)
+#add version header
+FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
+        "\#pragma once
 #include <string>
-
-namespace StaticData {
+namespace Version {
  const std::string VERSION = \"${PROJECT_VERSION}\";
-  const std::string TempFilePath = ${TempFilePath};
-  const std::string ConfigDir = ${CONFIG_PATH};
-  const std::string ConfName = \"${Application_Name}.cfg\";
  const std::string SAMPLECONFIG = R\"(${SAMPLECONFIG})\";
 }"
        )

+# generate post script for checking if configuration already exists
+FILE(WRITE ${CMAKE_SOURCE_DIR}/postinst
+        "#!/bin/bash
+if [ ! -f /etc/iprefresher.cfg ]; then
+    cat > /etc/iprefresher.cfg <<- EOM
+${SAMPLECONFIG}EOM
+fi\n"
+        )
+
 add_library(api ${LIB_METHOD}
        src/api/API.cpp
        src/api/TelegramAPI.cpp
        src/api/DynuAPI.cpp
        src/api/IPAPI.cpp)

-add_library(libdynuiprefresher ${LIB_METHOD}
-        src/IPRefresher.cpp
-        src/Config.cpp
-        src/IpHelper.cpp
+add_library(logger ${LIB_METHOD}
        src/FileLogger.cpp
-        src/Logger.cpp
-        )
+        src/Logger.cpp)

-add_executable(${Application_Name} src/main.cpp)
+
+SET(SOURCE
+        src/main.cpp
+        src/IPRefresher.cpp
+        src/Config.cpp)
+
+add_executable(iprefresher ${SOURCE})

 # LINK generated LIBS #
-target_link_libraries(${Application_Name} libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
+target_link_libraries(iprefresher api logger ${CURL_LIBRARIES} config++)

-if (${GUI})
-    set(QT5_LIBRARIES Qt5::Widgets Qt5::PrintSupport Qt5::Sql)
+# INSTALL to SYSTEM #
+SET(CMAKE_INSTALL_PREFIX "/")
+# install binaries
+install(TARGETS iprefresher DESTINATION usr/bin)
+# install systemd service and enable it
+install(FILES service/iprefresher.service DESTINATION lib/systemd/system)

-    set(UI_SOURCES
-            src/gui/mainwindow.ui
-            )

-    #
-    # Generate necessary headers from .ui files. (qmake lets `uic` do this job.)
-    # hint from [Cross-platform Qt5 project using cmake](http://stackoverflow.com/questions/21174586/cross-platform-qt5-project-using-cmake)
-    #
-    qt5_wrap_ui(UI_GENERATED_HEADERS ${UI_SOURCES})
-
-    add_executable(${Application_Name}-gui
-            src/maingui.cpp
-            src/gui/MainWindow.cpp
-            inc/gui/MainWindow.h
-            ${UI_GENERATED_HEADERS})
-
-    if (${WinBuild})
-        # hide console window when starting ui on windows
-        set_target_properties(${Application_Name}-gui PROPERTIES LINK_FLAGS "-mwindows")
-    endif ()
-
-    # LINK generated LIBS #
-    target_link_libraries(${Application_Name}-gui -lpthread libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES} ${QT5_LIBRARIES})
-endif ()
-
-# setting install targets
-IF (NOT ${WinBuild})
-    # INSTALL to Linux SYSTEM #
-
-    # install binaries
-    install(
-            TARGETS ${Application_Name}
-            DESTINATION usr/bin
-            COMPONENT ${Application_Name})
-    # install systemd service and enable it
-    install(
-            FILES service/${Application_Name}.service
-            DESTINATION lib/systemd/system
-            COMPONENT ${Application_Name})
-
-    if (${GUI})
-        # install binaries
-        install(
-                TARGETS ${Application_Name}-gui
-                DESTINATION usr/bin
-                COMPONENT ${Application_Name}gui)
-    endif ()
-ELSE ()
-    # INSTALL to Windows SYSTEM #
-
-    # install binary to current folder
-    set_target_properties(${Application_Name} PROPERTIES SUFFIX ".exe")
-    install(
-            TARGETS ${Application_Name}
-            DESTINATION .
-            COMPONENT ${Application_Name})
-
-    # install .dll dependencies
-    # todo check if files exist...
-    SET(LIBBINARYPATH "/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin")
-    install(FILES /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcurl-4.dll
-            ${LIBBINARYPATH}/libssh2-1.dll
-            ${LIBBINARYPATH}/libstdc++-6.dll
-            ${LIBBINARYPATH}/libgcc_s_seh-1.dll
-            ${LIBBINARYPATH}/libcrypto-1_1-x64.dll
-            ${LIBBINARYPATH}/libssl-1_1-x64.dll
-            ${LIBBINARYPATH}/libwinpthread-1.dll
-            ${LIBBINARYPATH}/zlib1.dll
-            ${LIBBINARYPATH}/libidn2-0.dll
-            ${LIBBINARYPATH}/libconfig++-11.dll
-            DESTINATION .
-            COMPONENT ${Application_Name})
-
-    if (${GUI})
-        # install binaries
-        set_target_properties(${Application_Name}-gui PROPERTIES SUFFIX ".exe")
-        install(
-                TARGETS ${Application_Name}-gui
-                DESTINATION .
-                COMPONENT ${Application_Name}gui)
-
-        # install .dll dependencies
-        install(FILES
-                ${LIBBINARYPATH}/Qt5Widgets.dll
-                ${LIBBINARYPATH}/Qt5Core.dll
-                ${LIBBINARYPATH}/Qt5Gui.dll
-                ${LIBBINARYPATH}/iconv.dll
-                ${LIBBINARYPATH}/libpcre2-16-0.dll
-                ${LIBBINARYPATH}/libpng16-16.dll
-                ${LIBBINARYPATH}/libharfbuzz-0.dll
-                ${LIBBINARYPATH}/libglib-2.0-0.dll
-                ${LIBBINARYPATH}/libintl-8.dll
-                ${LIBBINARYPATH}/libpcre-1.dll
-                ${LIBBINARYPATH}/libbz2-1.dll
-                ${LIBBINARYPATH}/libfreetype-6.dll
-                DESTINATION .
-                COMPONENT ${Application_Name}gui)
-
-        install(FILES
-                /usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/lib/qt5/plugins/platforms/qwindows.dll
-                DESTINATION ./platforms
-                COMPONENT ${Application_Name}gui)
-    endif ()
-ENDIF ()
-
-if (${PACKAGING})
-    # General Packaging options:
+IF (UNIX)
    message(STATUS "config of Package build")
+    SET(CPACK_DEB_COMPONENT_INSTALL 1)
+    SET(CPACK_OUTPUT_FILE_PREFIX packages)
+    SET(CPACK_PACKAGING_INSTALL_PREFIX "/") # no prefix for package structure
+
+    FIND_PROGRAM(RPMBUILD_EXECUTABLE rpmbuild)
+    FIND_PROGRAM(DEB_EXECUTABLE dpkg)
+
+    SET(CPACK_GENERATOR "TGZ;TBZ2")
+
+    #check if rpm build is possible
+    if (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
+        message(STATUS "found rpm build executeable --> able to build rpm")
+        SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
+        SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
+        SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION "/lib/systemd/system" "/lib/systemd" "/lib" "/usr/local/bin" "/usr/local") # --> needed to not override existing folders
+        set(CPACK_RPM_PACKAGE_REQUIRES "libcurl,libconfig")
+    else (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
+        message(STATUS "not found rpm build tools --> not building rpm")
+    endif (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
+
+    #check if deb build is possible
+    if (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
+        message(STATUS "found deb build tools --> able to build deb")
+        SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB") # add deb generator
+        set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst") # set post inst file
+        set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4,libconfig++9v5") # add debian dependencies
+    else (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
+        message(STATUS "not found  deb build tools --> not building deb")
+    endif (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
+
+
+    SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
+    SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")

-    set(CPACK_PACKAGE_NAME "DynuIpRefresher")
    SET(CPACK_PACKAGE_DESCRIPTION "IPrefresher to refresh Dynu ip address and notify user via Telegram")
    SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "IPrefresher to refresh Dynu ip address and notify user via Telegram")
    SET(CPACK_PACKAGE_VENDOR "Lukas Heilgienbrunner")
    SET(CPACK_PACKAGE_VERSION "${PROJECT_VERSION}")
    SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}-${PROJECT_VERSION}")
    SET(CPACK_PACKAGE_CONTACT "Lukas Heiligenbrunner <lukas.heiligenbrunner@gmail.com>")
-
-    SET(CMAKE_INSTALL_PREFIX "/")
-
-    IF (NOT ${WinBuild})
-        # generate post script for checking if configuration already exists
-        FILE(WRITE ${CMAKE_SOURCE_DIR}/postinst
-                "#!/bin/bash
-# Post installation script for linux packages
-# do not edit this file manually, it is generated by the cmake script
-if [ ! -f ${CONFIG_PATH} ]; then
-    cat > ${CONFIG_PATH} <<- EOM
-${SAMPLECONFIG}EOM
-fi
-
-systemctl enable ${Application_Name}.service
-systemctl restart ${Application_Name}.service")
-
-
-        SET(CPACK_DEB_COMPONENT_INSTALL 1)
-        SET(CPACK_OUTPUT_FILE_PREFIX packages)
-        SET(CPACK_PACKAGING_INSTALL_PREFIX "/") # no prefix for package structure
-
-        FIND_PROGRAM(RPMBUILD_EXECUTABLE rpmbuild)
-        FIND_PROGRAM(DEB_EXECUTABLE dpkg)
-
-        SET(CPACK_GENERATOR "TGZ;TBZ2")
-
-        #check if rpm build is possible
-        if (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
-            message(STATUS "found rpm build executeable --> able to build rpm")
-            SET(CPACK_GENERATOR "${CPACK_GENERATOR};RPM")
-            SET(CPACK_RPM_POST_INSTALL_SCRIPT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/postinst")
-            SET(CPACK_RPM_EXCLUDE_FROM_AUTO_FILELIST_ADDITION
-                    "/lib/systemd/system"
-                    "/lib/systemd"
-                    "/lib"
-                    "/usr/local/bin"
-                    "/usr/local") # --> not override existing folders
-
-            # dependency management tested with fedora!
-            set(CPACK_RPM_PACKAGE_REQUIRES "libcurl,libconfig")
-            if (${GUI})
-                # append rpm GUI dependencies (qt5)
-                set(CPACK_RPM_PACKAGE_REQUIRES "${CPACK_RPM_PACKAGE_REQUIRES},qt5-qtbase")
-            endif ()
-        else (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
-            message(STATUS "not found rpm build tools --> not building rpm")
-        endif (NOT ${RPMBUILD_EXECUTABLE} STREQUAL "RPMBUILD_EXECUTABLE-NOTFOUND")
-
-        #check if deb build is possible
-        if (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
-            message(STATUS "found deb build tools --> able to build deb")
-            SET(CPACK_GENERATOR "${CPACK_GENERATOR};DEB") # add deb generator
-            set(CPACK_DEBIAN_PACKAGE_CONTROL_EXTRA "${CMAKE_CURRENT_SOURCE_DIR}/postinst") # set post inst file
-
-            # dependency management tested with fedora!
-            set(CPACK_DEBIAN_PACKAGE_DEPENDS "libcurl4,libconfig++9v5") # add debian dependencies
-            if (${GUI})
-                # append debian GUI dependencies (qt5)
-                set(CPACK_DEBIAN_PACKAGE_DEPENDS "${CPACK_DEBIAN_PACKAGE_DEPENDS},qt5-default")
-            endif ()
-        else (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
-            message(STATUS "not found  deb build tools --> not building deb")
-        endif (NOT ${DEB_EXECUTABLE} STREQUAL "DEB_EXECUTABLE-NOTFOUND")
-
-
-        SET(CPACK_CMAKE_GENERATOR "Unix Makefiles")
-        SET(CPACK_SOURCE_GENERATOR "TGZ;TBZ2")
-
-        SET(CPACK_PACKAGE_SECTION "games")
-    ELSE ()
-        # Pack a NSIS intaller
-        set(CPACK_GENERATOR NSIS)
-        message(STATUS "Using NSIS Package build.")
-
-        set(CPACK_NSIS_EXECUTABLES_DIRECTORY "DynuIpRefresher")
-        set(CPACK_PACKAGE_INSTALL_DIRECTORY "DynuIpRefresher")
-        SET(CPACK_NSIS_MODIFY_PATH ON)
-        set(CPACK_NSIS_MENU_LINKS
-                "${Application_Name}.exe" "DynuIpRefresher Console"
-                "${Application_Name}-gui.exe" "DynuIpRefresher GUI")
-
-        # varnames need uppercase strings
-        string(TOUPPER ${Application_Name} APPLICATION_NAME_UPPER)
-        # Define components and their display names
-        set (CPACK_COMPONENTS_ALL ${Application_Name} ${Application_Name}gui)
-        set (CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_DISPLAY_NAME "Dynu IP Refresher Console")
-        set (CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DISPLAY_NAME "Dynu IP Refresher GUI")
-
-        # Human readable component descriptions
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_DESCRIPTION "An extremely useful application that makes use of MyLib")
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DESCRIPTION "Static libraries used to build programs with MyLib")
-
-        # Define dependencies between components
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_DEPENDS ${Application_Name})
-
-        # Define groups
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_GROUP "Runtime")
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_GROUP "Development")
-
-        set(CPACK_COMPONENT_GROUP_DEVELOPMENT_DESCRIPTION "All of the tools you'll ever need to develop software")
-
-        # Define NSIS installation types
-        set(CPACK_ALL_INSTALL_TYPES Full Developer)
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}_INSTALL_TYPES Developer Full)
-        set(CPACK_COMPONENT_${APPLICATION_NAME_UPPER}GUI_INSTALL_TYPES Full)
-    ENDIF ()
+    SET(CPACK_PACKAGE_SECTION "games")

    INCLUDE(CPack)

-    add_custom_target(build-packages
+    add_custom_target(build-linux-packages
            "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target package
-            DEPENDS ${Application_Name}
-            COMMENT "Packing ${Application_Name}")
+            DEPENDS ${PROJECT_NAME}
+            COMMENT "Installing ${PROJECT_NAME}")
    message("")
-ENDIF ()
+ENDIF (UNIX)

 # check if Doxygen is installed
 if (BUILD_DOC)
@ -466,44 +180,4 @@ if (BUILD_DOC)
        message(STATUS "Doxygen need to be installed to generate the doxygen documentation")
    endif (DOXYGEN_FOUND)
    message("")
-endif (BUILD_DOC)
-
-# Test Cases
-if (TESTS)
-    #    include(GoogleTest)
-    message(STATUS "Configuring GTEST")
-    find_package(GTest)
-    if (GTEST_FOUND)
-
-        mark_as_advanced(
-                BUILD_GMOCK BUILD_GTEST BUILD_SHARED_LIBS
-                gmock_build_tests gtest_build_samples gtest_build_tests
-                gtest_disable_pthreads gtest_force_shared_crt gtest_hide_internal_symbols
-        )
-
-        enable_testing()
-
-        macro(package_add_test TESTNAME)
-            # create an exectuable in which the tests will be stored
-            add_executable(${TESTNAME} ${ARGN})
-            # link the Google test infrastructure, mocking library, and a default main fuction to
-            target_link_libraries(${TESTNAME} gtest gtest_main -lpthread -lm api libdynuiprefresher ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
-            # see https://cmake.org/cmake/help/v3.10/module/GoogleTest.html for more options to pass to it
-            gtest_discover_tests(${TESTNAME})
-
-            add_custom_command(TARGET build-test
-                    POST_BUILD
-                    COMMAND "${CMAKE_COMMAND}" --build "${CMAKE_BINARY_DIR}" --target ${TESTNAME}
-                    COMMAND "bin/${TESTNAME}" --gtest_output=xml:${TESTNAME}-report.xml)
-        endmacro()
-
-        add_custom_target(build-test
-                DEPENDS ${PROJECT_NAME}
-                COMMENT "Testing ${PROJECT_NAME}")
-
-        package_add_test(test1 tests/UnitTest.cpp ${SOURCE})
-
-    else ()
-        message(STATUS "GTEST environment not found!")
-    endif ()
-ENDIF ()
+endif (BUILD_DOC)
--- a/Docker/Linux/Dockerfile
+++ b/Docker/Linux/Dockerfile
@ -1,19 +0,0 @@
-FROM gcc:latest
-MAINTAINER luki42
-
-RUN \
-    \
-    # Install texlive
-    echo "instaling cmake" && \
-    apt-get update && \
-    apt-get install -y --no-install-recommends cmake libgtest-dev && \
-    echo "installing build dependencies" && \
-    apt-get install -y --no-install-recommends libcurl4-openssl-dev libconfig++-dev && \
-    echo "installing packaging tools" && \
-    apt-get install -y --no-install-recommends dpkg rpm && \
-    # clean up
-    apt-get clean
-
-# Expose /home as workin dir
-WORKDIR /home
-VOLUME ["/home"]
--- a/Docker/Windows/Dockerfile
+++ b/Docker/Windows/Dockerfile
@ -1,20 +0,0 @@
-FROM fedora:33
-MAINTAINER luki42
-
-RUN \
-    \
-    # Install texlive
-    echo "instaling cmake" && \
-    dnf install -y mingw64-gcc-c++ mingw64-curl-static mingw64-qt5-qtbase wget cmake make tar xz mingw32-nsis gtest gtest-devel && \
-    wget http://repo.msys2.org/mingw/x86_64/mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz && \
-    tar -xf mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz && \
-    mv ./mingw64/bin/* /usr/x86_64-w64-mingw32/sys-root/mingw/bin && \
-    mv ./mingw64/include/* /usr/x86_64-w64-mingw32/sys-root/mingw/include && \
-    mv ./mingw64/lib/*.a /usr/x86_64-w64-mingw32/sys-root/mingw/lib && \
-    mv ./mingw64/lib/cmake/* /usr/x86_64-w64-mingw32/sys-root/mingw/lib/cmake && \
-    rm -Rv mingw-w64-x86_64-libconfig-1.7.2-1-any.pkg.tar.xz mingw64 && \
-    #cleanup
-    dnf clean dbcache && dnf clean packages
-# Expose /home as workin dir
-WORKDIR /home
-VOLUME ["/home"]
--- a/README.md
+++ b/README.md
@ -1,8 +1,6 @@
-[![pipeline status](http://gitlab.heili.eu/lukas/dynuiprefresher/badges/master/pipeline.svg)](http://gitlab.heili.eu/lukas/dynuiprefresher/-/commits/master)
 # DynuIPRefresher
 A lightweight C++ application to setup a service for refreshing a dynamic IP to the Dynu servers. 
 Dynu.com is a free DDns service and provides an API.
-There is also a GUI for Windows Users and beginners.

 ## Installation
 Download the latest Release at [Release_Page](https://github.com/Lukas-Heiligenbrunner/DynuIPRefresher/releases).
@ -10,38 +8,11 @@ I'm providing executables for Debian/Ubuntu (.deb) and RHEL/Debian (.rpm).
 But you can still compile the code my your own (see build section).

 ## Configuration
-There is a configuration file `/etc/dynuiprefresher.cfg` where you have to specify the DYNU API key (get it from their homepage), the domainid and your domain.
+There is a configuration file `/etc/iprefresher.cfg` where you have to specify the DYNU API key (get it from their homepage), the domainid and your domain.
 Furthermore, you can optionally specify a Telegram API key and a Chat ID if you want to be notfied when your local ip changes.

 To enable and start the service: 
-`systemctl enable dynuiprefresher.service` and `systemctl start dynuiprefresher.service`
-
-## Usage
-First of all configure the right keys in the `/etc/dynuiprefresher.cfg` or `%appdata%\DynuIpRefresher\dynuiprefresher.cfg` config file.
-
-Afterwards use the following options: 
-
-```
-help page: 
-[-h] [--help]  print this help page
-[-v] [--version] print the software version
-[-f] [--force] force refresh of ip
-[-l] [--loop] infinite loop to refresh ip every five minutes
-[-c] [--checkconfig] validate configuration
-[-ip] [--currentip] get current global ip
-[no argument] normal ip check and refresh
-```
-
-### GUI 
-
-You can also build the grapical user inteface if you want. 
-There you can manually trigger a refresh in a gui and set all the config parameters.
-
-Home Page:
-![couldn't load image](https://i.ibb.co/syDwWQg/Screenshot-20200608-104253.png)
-
-Config Page:
-![couldn't load image](https://i.ibb.co/89vnJXY/Screenshot-20200608-104308.png)
+`systemctl enable iprefresher.service` and `systemctl start iprefresher.service`


 ## Build
@ -97,25 +68,7 @@ cd into downloaded files and Generate makefiles:

 `make package`

-### GUI Build
-
-please use the predefined Docker-Image here: 
-[DockerHub](https://hub.docker.com/repository/docker/luki42/dynuiprefresher_build)


 ### Windows cross build
-Set Winbuild flag in CMakeList.txt.
-
-Dependencies:
-* MinGW Compiler
-* MinGW-libcurl
-* MinGW-libconfig++
-
-Optional dependencies
-* NSIS Pack tool (for creating installer)
-* doxygen (for generating html doc)
-
-The Simplest way to install all dependencies is the preconfigured Docker-Image:
-[DockerHub](https://hub.docker.com/repository/docker/luki42/dynuiprefresher_build)
-
-`make package` will pack it into a NSIS installer for Windows. 
+TODO!
--- a/config/dynuiprefresher.cfg
+++ b/config/dynuiprefresher.cfg
--- a/inc/Config.h
+++ b/inc/Config.h
@ -1,9 +1,6 @@
-/**
- * A static class to manage the configuration file, read/write parameters to it.
- *
- * @author Lukas Heiligenbrunner
- * @date 11.02.2020
- */
+//
+// Created by lukas on 11.02.20.
+//

 #pragma once

@ -11,19 +8,20 @@

 class Config {
 public:
-    /**
-    * read configuration out of config file
-    *
-    * @return success of config read
-    */
-    static bool readConfig();
+    static std::string dynuapikey;
+
+    static std::string domainid; //id of the dynu domain
+    static std::string domainname;
+
+    static std::string telegramApiKey;
+    static std::string chatId;

    /**
-     * save back configuration to file
+     * read configuration out of config file
     *
-     * @return success of config write
+     * @return success of config read
     */
-    static bool saveConfig();
+    static bool readCredentials();

    /**
     * validate config file
@ -32,82 +30,5 @@ public:
     */
    static bool validateConfig();

-    /**
-     * check if telegram credentials in config are set
-     * @return is supported?
-     */
-    static bool isTelegramSupported();
-
-    /** Getters **/
-
-    /**
-     * encapsulated getter for DynuApiKey
-     * @return api key
-     */
-    static const std::string &getDynuapikey();
-
-    /**
-     * encapsulated getter for DomainId
-     * @return DomainId
-     */
-    static const std::string &getDomainid();
-
-    /**
-     * encapsulated getter for Domainname
-     * @return Domainname
-     */
-    static const std::string &getDomainname();
-
-    /**
-     * encapsulated getter for TelegramApiKey
-     * @return TelegramApiKey
-     */
-    static const std::string &getTelegramApiKey();
-
-    /**
-     * encapsulated getter for ChatId
-     * @return ChatId
-     */
-    static const std::string &getChatId();
-
-    /**
-     * set all parameters without telegram support
-     *
-     * @param domainname Dynu Domain name
-     * @param dynuapikey Dynu api key
-     * @param domainid Dynu domain id
-     */
-    static void setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid);
-
-    /**
-     * set all parameters with telegram support
-     *
-     * @param domainname Dynu Domain name
-     * @param dynuapikey Dynu api key
-     * @param domainid Dynu domain id
-     * @param telegramApiKey Telegram api key
-     * @param chatId Telegram chat id
-     */
-    static void setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid,
-                          const std::string &telegramApiKey, const std::string &chatId);
-
 private:
-    /**
-     * private constructor --> don't allow instance of this class
-     */
-    Config() = default;
-
-    /**
-     * helper variable for managing telegram Support
-     */
-    static bool telegramSupport;
-
-    /**
-     * helper variables for storing keys and ids
-     */
-    static std::string dynuapikey;
-    static std::string domainid; //id of the dynu domain
-    static std::string domainname;
-    static std::string telegramApiKey;
-    static std::string chatId;
 };
--- a/inc/FileLogger.h
+++ b/inc/FileLogger.h
@ -1,9 +1,6 @@
-/**
- * Read and write current ip to a temp file to remember last ip until restart
- *
- * @author Lukas Heiligenbrunner
- * @date 05.05.2019
- */
+//
+// Created by lukas on 05.05.19.
+//

 #pragma once

--- a/inc/IPRefresher.h
+++ b/inc/IPRefresher.h
@ -1,33 +1,25 @@
-/**
- * IPrefresher library
- * - start checking ip once
- * - or in loop mode
- *
- * @author Lukas Heiligenbrunner
- * @date 06.04.2019
- */
+//
+// Created by lukas on 02.08.19.
+//

 #pragma once

-namespace IPRefresher {
-    /**
-     * Status return-codes for startUpService
-     */
-    namespace Status_Code {
-        const int SUCCESS = 1;
-        const int ERROR = -1;
-        const int ERROR_NO_INTERNET = -2;
-        const int NOREFRESH = 0;
-    }
-
+class IPRefresher {
+public:
    /**
     * refresh ip address on Dynu server
     */
-    bool checkIPAdress(bool force);
+    void checkIPAdress(bool force);
+
+    /**
+     * default constructor
+     */
+    IPRefresher();

    /**
     * start the service in loop mode
     * every 5 minutes the ip is checked an refreshed (needed for .service)
+     * @param loop true->loopmode on
     */
-    void startUpService(int interval = 300);
-}
+    explicit IPRefresher(bool loop);
+};
--- a/inc/IpHelper.h
+++ b/inc/IpHelper.h
@ -1,22 +0,0 @@
-/**
- * A helper class for general IP String actions
- *
- * @author Lukas Heiligenbrunner
- * @date 07.05.2020
- */
-
-#pragma once
-
-#include <string>
-
-class IpHelper {
-public:
-    /**
-     * check if ip is valid
-     * @param ip ip address to test
-     * @return validity
-     */
-    static bool isIpValid(const std::string& ip);
-
-private:
-};
--- a/inc/Logger.h
+++ b/inc/Logger.h
@ -1,10 +1,6 @@
-/**
- * Fancy console log output format
- * todo log level support
- *
- * @author Lukas Heiligenbrunner
- * @date 26.10.2019
- */
+//
+// Created by lukas on 26.10.19.
+//

 #pragma once

--- a/inc/api/API.h
+++ b/inc/api/API.h
@ -1,17 +1,12 @@
-/**
- * API class
- * - manages all curl download stuff
- * - easy POST/GET requests
- *
- * @author Lukas Heiligenbrunner
- * @date 06.04.2019
- */
+//
+// Created by lukas on 06.04.19.
+//

 #pragma once

-#include "Hashmap.h"

 #include <string>
+#include "Hashmap.h"

 class API {
 public:
@ -30,10 +25,7 @@ public:
     * @param headers header fields
     * @return return string of server
     */
-    std::string request(std::string myurl,
-                        bool post,
-                        Hashmap<std::string, std::string> &map,
-                        std::vector<std::string> &headers);
+    std::string request(std::string myurl, bool post, Hashmap<std::string, std::string> &map, std::vector<std::string> &headers);

 private:
    static size_t write_data(void *buffer, size_t size, size_t buffersize, FILE *stream);
--- a/inc/api/DynuAPI.h
+++ b/inc/api/DynuAPI.h
@ -1,22 +1,19 @@
-/**
- * Dynu API - Refresh the IP
- *
- * @author Lukas Heiligenbrunner
- * @date 18.06.2019
- */
+//
+// Created by lukas on 18.06.19.
+//

 #pragma once

 #include "API.h"

-class DynuAPI : API {
+class DynuAPI : API{
 public:
    /**
     * refresh the ip of domain on Dynu server
     * @param ip new ip
     * @return request status
     */
-    bool refreshIp(std::string ip);
+    int refreshIp(std::string ip);

    /**
     * init Telegram api with apikey and chatid
@ -24,21 +21,10 @@ public:
     * @param domainId ID of domain received by Dynu
     * @param domainName domainname to refresh
     */
-    void init(const std::string &dynuApiKey, const std::string &domainId, const std::string &domainName);
-
+    void init(const std::string& dynuApiKey, const std::string& domainId, const std::string& domainName);
 private:
-    /**
-     * Dynu API Key
-     */
-    std::string dynuapikey;
+    std::string dynuapikey; // Dynu API key

-    /**
-     * Dynu Domain ID
-     */
-    std::string domainid;
-
-    /**
-     * Domain name eg. "mydomain.dynu.net"
-     */
+    std::string domainid; //id of the dynu domain
    std::string domainname;
 };
--- a/inc/api/Hashmap.h
+++ b/inc/api/Hashmap.h
@ -1,9 +1,6 @@
-/**
- * A Hashmap class for easier Key-Value maps
- *
- * @author Lukas Heiligenbrunner
- * @date 07.04.2019
- */
+//
+// Created by lukas on 07.04.19.
+//

 #pragma once

--- a/inc/api/IPAPI.h
+++ b/inc/api/IPAPI.h
@ -1,17 +1,13 @@
-/**
- * IPAPI for getting global ip of current network
- *
- * @author Lukas Heiligenbrunner
- * @date 18.06.2019
- */
+//
+// Created by lukas on 18.06.19.
+//

 #pragma once

+#include <string>
 #include "API.h"

-#include <string>
-
-class IPAPI : API {
+class IPAPI : API{
 public:
    /**
     * get global ip of current internet connection
--- a/inc/api/TelegramAPI.h
+++ b/inc/api/TelegramAPI.h
@ -1,15 +1,12 @@
-/**
- * Telegram API for sending message to specific chat
- *
- * @author Lukas Heiligenbrunner
- * @date 08.05.2019
- */
+//
+// Created by lukas on 08.05.19.
+//

 #pragma once

-#include "API.h"

 #include <string>
+#include "API.h"

 class TelegramAPI : API {
 public:
@ -17,7 +14,7 @@ public:
     * send telegram Message to predefined destination
     * @param text message
     */
-    int sendMessage(const std::string &text);
+    int sendMessage(const std::string& text);

    /**
     * init Telegram api with apikey and chatid
--- a/inc/gui/MainWindow.h
+++ b/inc/gui/MainWindow.h
@ -1,63 +0,0 @@
-/**
- * Main GUI controller - User IO handlings
- *
- * @author Lukas Heiligenbrunner
- * @date 09.05.2020
- */
-
-#pragma once
-
-#include <QtWidgets/QMainWindow>
-
-namespace Ui {
-    class MainWindow;
-}
-
-class MainWindow : public QMainWindow {
-Q_OBJECT
-
-public:
-    /**
-     * constructor with basic initializations
-     */
-    explicit MainWindow();
-
-    /**
-     * destruct all gui elements
-     */
-    ~MainWindow();
-
-private:
-    Ui::MainWindow *ui;
-
-    /**
-     * all static initializations of custom gui elements
-     */
-    void initGui();
-
-private slots:
-
-    /**
-     * executed click handler for config button
-     */
-    void checkConfigBtn();
-
-    /**
-     * executed click handler for refresh btn
-     */
-    void refreshIPBtn();
-
-    /**
-     * executed click handler for save config btn
-     */
-    void saveConfigBtn();
-
-signals:
-
-    /**
-     * append a String line to the Log field
-     *
-     * @param QString string to be appended
-     */
-    void appendLogField(QString);
-};
--- a/service/dynuiprefresher.service
+++ b/service/dynuiprefresher.service
@ -2,7 +2,7 @@
 Description=IP Refresher
 After=network.target
 [Service]
-ExecStart=dynuiprefresher -l
+ExecStart=iprefresher -l
 WorkingDirectory=/root
 StandardOutput=inherit
 StandardError=inherit
--- a/src/Config.cpp
+++ b/src/Config.cpp
@ -1,12 +1,15 @@
-#include "Config.h"
-#include "Logger.h"
-#include "StaticData.h"
+//
+// Created by lukas on 11.02.20.
+//
+
+#include <Config.h>
+#include <Logger.h>

 #include <iostream>
 #include <cstring>
 #include <fstream>
 #include <libconfig.h++>
-#include <sys/stat.h>
+#include <Version.h>

 std::string Config::dynuapikey;
 std::string Config::domainid; //id of the dynu domain
@ -15,49 +18,21 @@ std::string Config::domainname;
 std::string Config::telegramApiKey;
 std::string Config::chatId;

-bool Config::telegramSupport;
-
-bool Config::readConfig() {
+bool Config::readCredentials() {
    libconfig::Config cfg;
    try {
-        cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
+        cfg.readFile("/etc/iprefresher.cfg");
    }
    catch (const libconfig::FileIOException &fioex) {
        std::cout << "I/O error while reading config file." << std::endl << "creating new config file!" << std::endl;

-        // check if config folder exists
-        struct stat info{};
-
-        if (stat(StaticData::ConfigDir.c_str(), &info) != 0) {
-            Logger::warning("The config folder doesn't exist. Trying to create it.");
-
-// mkdir command is different defined for windows
-#ifdef __unix
-            int check = mkdir(StaticData::ConfigDir.c_str(), 777);
-#else
-            int check = mkdir(StaticData::ConfigDir.c_str());
-#endif
-
-            // check if directory is created or not
-            if (!check)
-                Logger::message("config directory successfully created. ");
-            else
-                Logger::error("unable to create config directory.");
-
-        } else if (info.st_mode & S_IFDIR) {
-            Logger::debug("config directory exists already");
-        } else {
-            Logger::error("A file exists with the same name as the config dir should be");
-        }
-
-
        std::ofstream myfile;
-        myfile.open(StaticData::ConfigDir + StaticData::ConfName);
+        myfile.open("/etc/iprefresher.cfg");
        if (myfile.is_open()) {
-            myfile << StaticData::SAMPLECONFIG;
+            myfile << Version::SAMPLECONFIG;
            myfile.close();
        } else {
-            Logger::error("error creating file");
+            std::cout << "error creating file" << std::endl;
        }

        return false;
@ -76,31 +51,22 @@ bool Config::readConfig() {
        // optional parameters
        telegramApiKey = (std::string) cfg.lookup("telegramApiKey");
        chatId = (std::string) cfg.lookup("chatId");
-        telegramSupport = true;
    }
    catch (const libconfig::SettingNotFoundException &nfex) {
        // triggered if setting is missing in config
        if (!(std::strcmp("telegramApiKey", nfex.getPath()) == 0 || std::strcmp("chatId", nfex.getPath()) == 0)) {
            std::cerr << "No '" << nfex.getPath() << "' setting in configuration file." << std::endl;
-        } else {
-            Logger::message("no Telegram support - fields in config not set");
-            telegramSupport = false;
        }
    }
    // check if needed values aren't empty
    return !(Config::dynuapikey.empty() || Config::domainid.empty() || Config::domainname.empty());
 }

-bool Config::saveConfig() {
-    // todo save config
-    return false;
-}
-
 bool Config::validateConfig() {
    libconfig::Config cfg;
    try {
        Logger::message("reading config file");
-        cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
+        cfg.readFile("/etc/iprefresher.cfg");
    }
    catch (const libconfig::FileIOException &fioex) {
        Logger::warning("config file doesn't exist or permission denied!");
@ -116,67 +82,27 @@ bool Config::validateConfig() {
    try {
        // needed parameters
        if (((std::string) cfg.lookup("dynuapikey")).empty()) {
-            Logger::warning("required parameter \"dynuapikey\" seems to be empty.");
+            Logger::warning("required parameter dynuapikey seems to be empty.");
            return false;
        }
        if (((std::string) cfg.lookup("domainid")).empty()) {
-            Logger::warning("required parameter \"domainid\" seems to be empty.");
+            Logger::warning("required parameter domainid seems to be empty.");
            return false;
        }
        if (((std::string) cfg.lookup("domainname")).empty()) {
-            Logger::warning("required parameter \"domainname\" seems to be empty.");
+            Logger::warning("required parameter domainname seems to be empty.");
            return false;
        }
        // optional parameters
        cfg.lookup("telegramApiKey");
        cfg.lookup("chatId");
-        telegramSupport = true;
    }
    catch (const libconfig::SettingNotFoundException &nfex) {
        // triggered if setting is missing in config
        if (!(std::strcmp("telegramApiKey", nfex.getPath()) == 0 || std::strcmp("chatId", nfex.getPath()) == 0)) {
            std::cerr << "No '" << nfex.getPath() << "' setting in configuration file." << std::endl;
            return false;
-        } else {
-            Logger::message("no Telegram support - fields in config not set");
-            telegramSupport = false;
        }
    }
    return true;
-}
-
-bool Config::isTelegramSupported() {
-    return telegramSupport;
-}
-
-const std::string &Config::getDynuapikey() {
-    return dynuapikey;
-}
-
-const std::string &Config::getDomainid() {
-    return domainid;
-}
-
-const std::string &Config::getDomainname() {
-    return domainname;
-}
-
-const std::string &Config::getTelegramApiKey() {
-    return telegramApiKey;
-}
-
-const std::string &Config::getChatId() {
-    return chatId;
-}
-
-void Config::setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid) {
-    Config::domainname = domainname;
-    Config::dynuapikey = dynuapikey;
-    Config::domainid = domainid;
-}
-
-void Config::setValues(const std::string &domainname, const std::string &dynuapikey, const std::string &domainid, const std::string &telegramApiKey, const std::string &chatId) {
-    setValues(domainname, dynuapikey, domainid);
-    Config::telegramApiKey = telegramApiKey;
-    Config::chatId = chatId;
-}
+}
--- a/src/FileLogger.cpp
+++ b/src/FileLogger.cpp
@ -1,13 +1,15 @@
-#include "FileLogger.h"
-#include "IpHelper.h"
-#include "StaticData.h"
+//
+// Created by lukas on 05.05.19.
+//

 #include <fstream>
 #include <iostream>

+#include "FileLogger.h"
+
 void FileLogger::safeip(std::string ip) {
    std::ofstream out;
-    out.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::out);
+    out.open("ip.txt", std::ios::out);

    out << ip;

@ -16,12 +18,11 @@ void FileLogger::safeip(std::string ip) {

 std::string FileLogger::readip() {
    std::ifstream in;
-    in.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::in);
+    in.open("ip.txt", std::ios::in);

    std::string ip;

    in >> ip;

-    // when received ip has no . return 0.0.0.0
-    return (IpHelper::isIpValid(ip) ? ip : "0.0.0.0");
+    return ip;
 }
--- a/src/IPRefresher.cpp
+++ b/src/IPRefresher.cpp
@ -1,17 +1,23 @@
-#include "IPRefresher.h"
-#include "FileLogger.h"
-#include "api/IPAPI.h"
-#include "api/DynuAPI.h"
-#include "api/TelegramAPI.h"
-#include "Config.h"
-#include "StaticData.h"
-#include "IpHelper.h"
+//
+// Created by lukas on 02.08.19.
+//
+
+#include <string>
+
+#include <FileLogger.h>
+#include <api/IPAPI.h>
+#include <api/DynuAPI.h>
+#include <api/TelegramAPI.h>

 #include <chrono>
 #include <thread>
 #include <Logger.h>

-bool IPRefresher::checkIPAdress(bool force) {
+#include <IPRefresher.h>
+#include <Config.h>
+#include <Version.h>
+
+void IPRefresher::checkIPAdress(bool force) {
    FileLogger logger;

    IPAPI ipapi;
@ -20,52 +26,45 @@ bool IPRefresher::checkIPAdress(bool force) {
    if (ip.empty()) {
        //no internet connection (or other error)
        Logger::warning("no internet connection");
-        return Status_Code::ERROR_NO_INTERNET;
-    } else if (!IpHelper::isIpValid(ip)) {
-        // error when ip doesn't contain a :
-        Logger::warning("an error occured when getting the global ip");
-        return Status_Code::ERROR;
    } else {
        std::string oldip = logger.readip();

        if (oldip == ip && !force) {
            Logger::message("no change -- ip: " + ip);
-            return Status_Code::NOREFRESH;
        } else {
            Logger::message("ip changed! -- from :" + oldip + "to: " + ip);

            DynuAPI dynu;
-            dynu.init(Config::getDynuapikey(), Config::getDomainid(), Config::getDomainname());
-            // actual refresh of IP in api - here
-            bool result = dynu.refreshIp(ip);
+            dynu.init(Config::dynuapikey, Config::domainid, Config::domainname);

-            if (result && Config::isTelegramSupported()) {
+            if (dynu.refreshIp(ip)) {
                TelegramAPI tele;
-                tele.init(Config::getTelegramApiKey(), Config::getChatId());
+                tele.init(Config::telegramApiKey, Config::chatId);
                tele.sendMessage(oldip + " moved to " + ip);
-            } else if (!result) {
+            } else {
                //error
                Logger::error("failed to write ip to dynu api!");
-                return Status_Code::ERROR;
            }

            logger.safeip(ip);
-            return result ? Status_Code::SUCCESS : Status_Code::ERROR;
        }
    }
 }

-void IPRefresher::startUpService(int interval) {
-    Logger::message("startup of service");
-    Logger::message("Version: " + StaticData::VERSION);
+IPRefresher::IPRefresher() = default;

-    while (true) {
-        Logger::message("starting check");
-        if (Config::readConfig()) {
-            checkIPAdress(false);
+IPRefresher::IPRefresher(bool loop) {
+    if (loop) {
+        Logger::message("startup of service");
+        Logger::message("Version: " + Version::VERSION);
+        if (Config::readCredentials()) {
+            while (true) {
+                Logger::message("starting check");
+                checkIPAdress(false);
+                std::this_thread::sleep_for(std::chrono::milliseconds(300000));
+            }
        } else {
            std::cout << "incorrect credentials!" << std::endl;
        }
-        std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
    }
 }
--- a/src/IpHelper.cpp
+++ b/src/IpHelper.cpp
@ -1,7 +0,0 @@
-#include <regex>
-#include "IpHelper.h"
-
-bool IpHelper::isIpValid(const std::string& ip) {
-    const std::regex rgx(R"(^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}$)");
-    return (std::regex_match(ip, rgx));
-}
--- a/src/Logger.cpp
+++ b/src/Logger.cpp
@ -1,8 +1,12 @@
-#include "Logger.h"
+//
+// Created by lukas on 26.10.19.
+//

 #include <sstream>
 #include <iostream>

+#include "Logger.h"
+
 void Logger::debug(const std::string message) {
    log(message, Logger::Debug);
 }
--- a/src/api/API.cpp
+++ b/src/api/API.cpp
@ -1,8 +1,13 @@
+//
+// Created by lukas on 06.04.19.
+//
+
 #include "api/API.h"

 #include <sstream>
 #include <curl/curl.h>

+
 std::string API::request(std::string myurl) {
    Hashmap<std::string, std::string> map;
    std::vector<std::string> str;
--- a/src/api/DynuAPI.cpp
+++ b/src/api/DynuAPI.cpp
@ -1,6 +1,10 @@
+//
+// Created by lukas on 18.06.19.
+//
+
 #include "api/DynuAPI.h"

-bool DynuAPI::refreshIp(std::string ip) {
+int DynuAPI::refreshIp(std:: string ip) {
    Hashmap<std::string, std::string> args;
    args.add("name", domainname);
    args.add("ipv4Address", ip);
@ -12,11 +16,15 @@ bool DynuAPI::refreshIp(std::string ip) {

    const std::string dynurepl = request("https://api.dynu.com/v2/dns/" + domainid, true, args, headers);

-    return (dynurepl == "{\"statusCode\":200}");
+    if (dynurepl != "{\"statusCode\":200}") {
+        return -1;
+    } else {
+        return 1;
+    }
 }

-void DynuAPI::init(const std::string &dynuApiKey, const std::string &domainId, const std::string &domainName) {
-    this->dynuapikey = dynuApiKey;
-    this->domainid = domainId;
-    this->domainname = domainName;
+void DynuAPI::init(const std::string& dynuApiKey, const std::string& domainId, const std::string& domainName) {
+    this->dynuapikey=dynuApiKey;
+    this->domainid=domainId;
+    this->domainname=domainName;
 }
--- a/src/api/IPAPI.cpp
+++ b/src/api/IPAPI.cpp
@ -1,11 +1,9 @@
-#include <IpHelper.h>
-#include <Logger.h>
+//
+// Created by lukas on 18.06.19.
+//
+
 #include "api/IPAPI.h"

 std::string IPAPI::getGlobalIp() {
-    const std::string ip = request("https://api.ipify.org");
-    if(!IpHelper::isIpValid(ip))
-        Logger::warning("no valid ip returned from ipapi");
-
-    return ip;
-}
+    return request("https://api.ipify.org");
+}
--- a/src/api/TelegramAPI.cpp
+++ b/src/api/TelegramAPI.cpp
@ -1,7 +1,12 @@
-#include "api/TelegramAPI.h"
-#include "Logger.h"
+//
+// Created by lukas on 08.05.19.
+//

-int TelegramAPI::sendMessage(const std::string &text) {
+#include "api/TelegramAPI.h"
+
+#include <Logger.h>
+
+int TelegramAPI::sendMessage(const std::string& text) {
    Hashmap<std::string, std::string> args;
    args.add("chat_id", chatid);
    args.add("text", text);
@ -10,8 +15,9 @@ int TelegramAPI::sendMessage(const std::string &text) {

    std::string reply = request("https://api.telegram.org/bot" + apikey + "/sendmessage", false, args, headers);

-    if (reply.find("\"error_code\"") != SIZE_MAX) {
-        Logger::error("failed to send the Telegram Message");
+    unsigned const long ULONG_MAX = -1;
+    if (reply.find("\"error_code\"") != ULONG_MAX) {
+        Logger::error("failed to refresh the ip (Dynu API)");
        return -1;
    }
    return 1;
--- a/src/gui/MainWindow.cpp
+++ b/src/gui/MainWindow.cpp
@ -1,129 +0,0 @@
-#include "inc/gui/MainWindow.h"
-#include "ui_mainwindow.h"
-
-#include "api/IPAPI.h"
-#include "IPRefresher.h"
-#include "Config.h"
-#include "Logger.h"
-
-#include <thread>
-
-MainWindow::MainWindow() : QMainWindow(), ui(new Ui::MainWindow) {
-    ui->setupUi(this);
-
-    // initialize gui with start parameters
-    initGui();
-
-    connect(ui->buttonCheckConfig, SIGNAL(clicked()), this, SLOT(checkConfigBtn()));
-    connect(ui->buttonRefreshIP, SIGNAL(clicked()), this, SLOT(refreshIPBtn()));
-    connect(ui->buttonSaveConfig, SIGNAL(clicked()), this, SLOT(saveConfigBtn()));
-
-    connect(this, SIGNAL(appendLogField(QString)), ui->textLog, SLOT(appendPlainText(QString)));
-}
-
-MainWindow::~MainWindow() {
-    // todo check if disconnects are really necessary
-    disconnect(ui->buttonCheckConfig);
-    disconnect(ui->buttonRefreshIP);
-    this->destroy();
-    delete ui;
-}
-
-void MainWindow::checkConfigBtn() {
-    Logger::message("checking config!");
-    appendLogField("checking config!");
-
-    if (Config::validateConfig()) {
-        Logger::message("Config file is OK");
-        appendLogField("Config file is OK");
-        ui->labelConfig->setText("Config is: OK");
-    } else {
-        Logger::error("There are errors in config file!");
-        appendLogField("There are errors in config file!");
-    }
-    appendLogField("");
-}
-
-void MainWindow::refreshIPBtn() {
-    Logger::message("start refreshing Dynu IP.");
-    appendLogField("");
-    appendLogField("start refreshing Dynu IP.");
-    new std::thread([this]() {
-        if (Config::readConfig()) {
-            int code = IPRefresher::checkIPAdress(false);
-            switch (code) {
-                case IPRefresher::Status_Code::SUCCESS:
-                    appendLogField("successfully refreshed IP!");
-                    break;
-                case IPRefresher::Status_Code::NOREFRESH:
-                    appendLogField("IP is already correct.");
-                    break;
-                case IPRefresher::Status_Code::ERROR_NO_INTERNET:
-                    appendLogField("Error: No Internet connection");
-                    break;
-                case IPRefresher::Status_Code::ERROR:
-                    appendLogField("An error occured while refreshing.");
-                    break;
-                default:
-                    appendLogField("An unknown error code occured");
-            }
-        } else {
-            std::cout << "incorrect credentials!" << std::endl;
-        }
-
-        Logger::message("Finished refreshing Dynu IP.");
-        this->appendLogField("Finished refreshing Dynu IP.");
-    });
-}
-
-void MainWindow::saveConfigBtn() {
-    if (ui->telegramsupportCheckbox->isChecked()) {
-        Config::setValues(
-                ui->domainnameedit->text().toStdString(),
-                ui->dynuapikeyedit->text().toStdString(),
-                ui->domainidedit->text().toStdString(),
-                ui->telegramapikeyedit->text().toStdString(),
-                ui->chatidedit->text().toStdString());
-    } else {
-        Config::setValues(
-                ui->domainnameedit->text().toStdString(),
-                ui->dynuapikeyedit->text().toStdString(),
-                ui->domainidedit->text().toStdString());
-    }
-    Config::saveConfig();
-}
-
-void MainWindow::initGui() {
-    // needs to be defined with new -- would be termintated after the constructor call.
-    new std::thread([this]() {
-        IPAPI ipapi;
-        std::string ip = ipapi.getGlobalIp();
-        Logger::message("Current global IP: " + ip);
-        std::string msg = "Your current global IP: " + ip;
-        this->ui->labelCurrentIP->setText(msg.c_str());
-    });
-
-    // set config info label and initial check if config is valid
-    ui->labelConfig->setText(Config::validateConfig() ? "Config is: OK" : "Config is: NOT OK");
-
-    if (Config::readConfig()) {
-        ui->dynuapikeyedit->setText(Config::getDynuapikey().c_str());
-        ui->domainidedit->setText(Config::getDomainid().c_str());
-        ui->domainnameedit->setText(Config::getDomainname().c_str());
-
-        if (Config::isTelegramSupported()) {
-            ui->telegramsupportCheckbox->setCheckState(Qt::Checked);
-            ui->telegramapikeyedit->setText(Config::getTelegramApiKey().c_str());
-            ui->chatidedit->setText(Config::getChatId().c_str());
-        } else {
-            ui->telegramsupportCheckbox->setCheckState(Qt::Unchecked);
-            ui->telegramapikeyedit->setDisabled(true);
-            ui->chatidedit->setDisabled(true);
-        }
-    } else {
-        // todo duplicate code with above
-        ui->telegramsupportCheckbox->setCheckState(Qt::Unchecked);
-        ui->telegramapikeyedit->setDisabled(true);
-        ui->chatidedit->setDisabled(true);
-    }
-}
--- a/src/gui/mainwindow.ui
+++ b/src/gui/mainwindow.ui
@ -1,320 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>823</width>
-    <height>618</height>
-   </rect>
-  </property>
-  <property name="cursor">
-   <cursorShape>ArrowCursor</cursorShape>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <property name="styleSheet">
-   <string notr="true">/*background-color: rgb(69, 196, 255);</string>
-  </property>
-  <widget class="QWidget" name="centralwidget">
-   <widget class="QPlainTextEdit" name="textLog">
-    <property name="enabled">
-     <bool>false</bool>
-    </property>
-    <property name="geometry">
-     <rect>
-      <x>40</x>
-      <y>410</y>
-      <width>741</width>
-      <height>191</height>
-     </rect>
-    </property>
-    <property name="cursor" stdset="0">
-     <cursorShape>IBeamCursor</cursorShape>
-    </property>
-   </widget>
-   <widget class="QLabel" name="label_2">
-    <property name="geometry">
-     <rect>
-      <x>40</x>
-      <y>380</y>
-      <width>64</width>
-      <height>17</height>
-     </rect>
-    </property>
-    <property name="text">
-     <string>Log:</string>
-    </property>
-   </widget>
-   <widget class="QTabWidget" name="tabWidget">
-    <property name="geometry">
-     <rect>
-      <x>40</x>
-      <y>20</y>
-      <width>741</width>
-      <height>351</height>
-     </rect>
-    </property>
-    <property name="currentIndex">
-     <number>0</number>
-    </property>
-    <widget class="QWidget" name="basic">
-     <attribute name="title">
-      <string>Basic</string>
-     </attribute>
-     <widget class="QLabel" name="labelCurrentIP">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>30</y>
-        <width>301</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Your current global IP:</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="labelConfig">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>70</y>
-        <width>141</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Config is: undefined</string>
-      </property>
-     </widget>
-     <widget class="QGroupBox" name="groupBox">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>120</y>
-        <width>231</width>
-        <height>151</height>
-       </rect>
-      </property>
-      <property name="title">
-       <string>Actions</string>
-      </property>
-      <widget class="QPushButton" name="buttonCheckConfig">
-       <property name="geometry">
-        <rect>
-         <x>30</x>
-         <y>50</y>
-         <width>91</width>
-         <height>33</height>
-        </rect>
-       </property>
-       <property name="cursor">
-        <cursorShape>ArrowCursor</cursorShape>
-       </property>
-       <property name="text">
-        <string>Check Config</string>
-       </property>
-      </widget>
-      <widget class="QPushButton" name="buttonRefreshIP">
-       <property name="geometry">
-        <rect>
-         <x>30</x>
-         <y>100</y>
-         <width>91</width>
-         <height>33</height>
-        </rect>
-       </property>
-       <property name="text">
-        <string>Refresh IP</string>
-       </property>
-      </widget>
-     </widget>
-    </widget>
-    <widget class="QWidget" name="config">
-     <attribute name="title">
-      <string>Config</string>
-     </attribute>
-     <widget class="QCheckBox" name="telegramsupportCheckbox">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>120</y>
-        <width>181</width>
-        <height>21</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Telegram Notifications</string>
-      </property>
-     </widget>
-     <widget class="QPushButton" name="buttonSaveConfig">
-      <property name="geometry">
-       <rect>
-        <x>630</x>
-        <y>270</y>
-        <width>91</width>
-        <height>33</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Save Config</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>20</y>
-        <width>101</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Dynu API Key</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_3">
-      <property name="geometry">
-       <rect>
-        <x>460</x>
-        <y>20</y>
-        <width>111</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Domain ID</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_4">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>170</y>
-        <width>131</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Telegram API Key</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_5">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>240</y>
-        <width>64</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Chat ID</string>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="dynuapikeyedit">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>40</y>
-        <width>211</width>
-        <height>31</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="domainidedit">
-      <property name="geometry">
-       <rect>
-        <x>460</x>
-        <y>40</y>
-        <width>113</width>
-        <height>31</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="chatidedit">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>260</y>
-        <width>113</width>
-        <height>31</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="telegramapikeyedit">
-      <property name="geometry">
-       <rect>
-        <x>30</x>
-        <y>190</y>
-        <width>311</width>
-        <height>31</height>
-       </rect>
-      </property>
-     </widget>
-     <widget class="QLineEdit" name="domainnameedit">
-      <property name="geometry">
-       <rect>
-        <x>280</x>
-        <y>40</y>
-        <width>161</width>
-        <height>31</height>
-       </rect>
-      </property>
-      <property name="placeholderText">
-       <string>domain.dynu.net</string>
-      </property>
-     </widget>
-     <widget class="QLabel" name="label_6">
-      <property name="geometry">
-       <rect>
-        <x>280</x>
-        <y>20</y>
-        <width>111</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Domainname</string>
-      </property>
-     </widget>
-    </widget>
-    <widget class="QWidget" name="settings">
-     <attribute name="title">
-      <string>Settings</string>
-     </attribute>
-     <widget class="QLabel" name="label_7">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>30</y>
-        <width>161</width>
-        <height>17</height>
-       </rect>
-      </property>
-      <property name="text">
-       <string>Select your language:</string>
-      </property>
-     </widget>
-     <widget class="QComboBox" name="languageComboBox">
-      <property name="geometry">
-       <rect>
-        <x>20</x>
-        <y>60</y>
-        <width>94</width>
-        <height>31</height>
-       </rect>
-      </property>
-     </widget>
-    </widget>
-   </widget>
-  </widget>
-  <widget class="QStatusBar" name="statusbar"/>
- </widget>
- <resources/>
- <connections/>
-</ui>
--- a/src/main.cpp
+++ b/src/main.cpp
@ -1,9 +1,13 @@
-#include "StaticData.h"
-#include "IPRefresher.h"
-#include "Logger.h"
-#include "Config.h"
-#include "api/IPAPI.h"
+//
+// Created by lukas on 18.06.19.
+//

+#include <Version.h>
+#include <IPRefresher.h>
+#include <Logger.h>
+#include <Config.h>
+
+#include <iostream>
 /**
 * application entry point
 */
@ -16,36 +20,34 @@ int main(int argc, char *argv[]) {
                      << "[-f] [--force] force refresh of ip" << std::endl
                      << "[-l] [--loop] infinite loop to refresh ip every five minutes" << std::endl
                      << "[-c] [--checkconfig] validate configuration" << std::endl
-                      << "[-ip] [--currentip] get current global ip" << std::endl
                      << "[no argument] normal ip check and refresh" << std::endl;
        } else if (firstarg == "-v" || firstarg == "--version") {
-            std::cout << "Version " << StaticData::VERSION << std::endl;
+            std::cout << "Version " << Version::VERSION << std::endl;
        } else if (firstarg == "-f" || firstarg == "--force") {
-            if (Config::readConfig()) {
-                IPRefresher::checkIPAdress(true);
+            IPRefresher ipr;
+            if (Config::readCredentials()) {
+                ipr.checkIPAdress(true);
            } else {
                std::cout << "incorrect credentials!" << std::endl;
            }

        } else if (firstarg == "-l" || firstarg == "--loop") {
-            IPRefresher::startUpService(600);
+            IPRefresher(true);
        } else if (firstarg == "-c" || firstarg == "--checkconfig") {
            if (Config::validateConfig()) {
                Logger::message("Config file is OK");
            } else {
-                Logger::error("There are errors in config file!");
+                Logger::warning("There are errors in config file!");
                return -1;
            }
-        } else if (firstarg == "-ip" || firstarg == "--currentip") {
-            IPAPI ipapi;
-            std::cout << "Current global IP: " << ipapi.getGlobalIp() << std::endl;
        } else {
            Logger::message("wrong arguments!  -h for help");
        }
    } else {
+        IPRefresher ipr;
        Logger::message("starting check");
-        if (Config::readConfig()) {
-            IPRefresher::checkIPAdress(false);
+        if (Config::readCredentials()) {
+            ipr.checkIPAdress(false);
        } else {
            std::cout << "incorrect credentials!" << std::endl;
        }
--- a/src/maingui.cpp
+++ b/src/maingui.cpp
@ -1,14 +0,0 @@
-#include <QApplication>
-#include "gui/MainWindow.h"
-
-/**
- * application entry point
- */
-int main(int argc, char *argv[]) {
-    QApplication a(argc, argv);
-    MainWindow w;
-    w.setWindowTitle("Dynu IP Refresher");
-    w.show();
-
-    return QApplication::exec();
-}
--- a/tests/UnitTest.cpp
+++ b/tests/UnitTest.cpp
@ -1,29 +0,0 @@
-//
-// Created by lukas on 06.05.20.
-//
-
-#include <FileLogger.h>
-#include <api/IPAPI.h>
-#include "gtest/gtest.h"
-
-/**
- * Test if default ip is 0.0.0.0 when last ip file doesn't exist.
- */
-TEST(ReadIp, testzeroIpIfNotExists) {
-    FileLogger logger;
-    std::string oldip = logger.readip();
-    ASSERT_EQ(oldip, "0.0.0.0");
-}
-/**
- * Test if default ip is 0.0.0.0 when last ip file doesn't exist.
- */
-TEST(IPAPI, testIpAPIcheckIPSyntax) {
-    IPAPI ipapi;
-    std::string ip = ipapi.getGlobalIp();
-    if (ip.find('.') == SIZE_MAX) {
-        // error when ip doesn't contain a .
-        ASSERT_TRUE(false);
-    } else {
-        ASSERT_TRUE(true);
-    }
-}