Compare commits
22 Commits
Author | SHA1 | Date | |
---|---|---|---|
891330825a | |||
ad452feca2 | |||
05ca1ff60b | |||
94964d69be | |||
2d1e99260d | |||
095eb5c0cd | |||
a231e6c852 | |||
|
8d688716eb | ||
4b19ecf3c3 | |||
85ba334c21 | |||
|
2762605ca4 | ||
81de98bf6c | |||
3f75484f77 | |||
f4069d02bf | |||
4344e7c118 | |||
268aa3a1ad | |||
3be8203111 | |||
b5b352f83d | |||
3b32f60190 | |||
0eea7095e0 | |||
ab772aac55 | |||
c25996a925 |
@ -1,95 +1,68 @@
|
||||
stages:
|
||||
- cmake
|
||||
- build
|
||||
- post
|
||||
|
||||
# Unix Build
|
||||
cmake:
|
||||
stage: cmake
|
||||
image: luki42/dynuiprefresher_build:latest
|
||||
script:
|
||||
- cmake -S . -B build
|
||||
artifacts:
|
||||
paths:
|
||||
- build/
|
||||
- inc/
|
||||
- postinst
|
||||
|
||||
build:
|
||||
stage: build
|
||||
image: luki42/dynuiprefresher_build:latest
|
||||
script:
|
||||
- cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
|
||||
- cd build
|
||||
- make iprefresher
|
||||
- make dynuiprefresher
|
||||
artifacts:
|
||||
paths:
|
||||
- build/
|
||||
- inc/
|
||||
- postinst
|
||||
dependencies:
|
||||
- cmake
|
||||
- build/bin/
|
||||
|
||||
|
||||
build_package:
|
||||
stage: post
|
||||
image: luki42/dynuiprefresher_build:latest
|
||||
script:
|
||||
- cmake -S . -B build -D WinBuild=OFF -D GUI=OFF
|
||||
- cd build
|
||||
- make package
|
||||
artifacts:
|
||||
paths:
|
||||
- build/
|
||||
- inc/
|
||||
- postinst
|
||||
dependencies:
|
||||
- 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
|
||||
dependencies:
|
||||
needs:
|
||||
- build
|
||||
|
||||
# Windows Build
|
||||
cmake_win64:
|
||||
stage: cmake
|
||||
image: luki42/dynuiprefresher_build:windows
|
||||
script:
|
||||
- cmake -S . -B build -D WinBuild=ON
|
||||
artifacts:
|
||||
paths:
|
||||
- build/
|
||||
- inc/
|
||||
|
||||
build_win64:
|
||||
stage: build
|
||||
image: luki42/dynuiprefresher_build:windows
|
||||
script:
|
||||
- cmake -S . -B build -D WinBuild=ON
|
||||
- cd build
|
||||
- make iprefresher
|
||||
- make dynuiprefresher
|
||||
artifacts:
|
||||
paths:
|
||||
- build/
|
||||
- inc/
|
||||
dependencies:
|
||||
- cmake_win64
|
||||
- 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/
|
||||
- inc/
|
||||
dependencies:
|
||||
- build/packages/
|
||||
needs:
|
||||
- build_win64
|
199
CMakeLists.txt
199
CMakeLists.txt
@ -19,7 +19,8 @@ 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(WinBuild "cross compile for Windows Platform" OFF)
|
||||
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)
|
||||
@ -66,15 +67,19 @@ if (${WinBuild})
|
||||
# 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 same as executable
|
||||
# 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 /etc/ config path
|
||||
# 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
|
||||
@ -99,7 +104,7 @@ if (${WinBuild})
|
||||
message(STATUS "Using CURL lib(s): ${CURL_LIBRARIES}")
|
||||
message(STATUS "")
|
||||
|
||||
include_directories(${CURL_INCLUDE_DIRS} inc)
|
||||
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
|
||||
@ -108,7 +113,11 @@ if (${WinBuild})
|
||||
message(STATUS "Using LIBCONFIG++ include dir(s): ${LIBCONFIG++_INCLUDE_DIRS}")
|
||||
message(STATUS "Using LIBCONFIG++ lib(s): ${LIBCONFIG++_LIBRARIES}")
|
||||
|
||||
include_directories(${LIBCONFIG++_INCLUDE_DIRS} inc)
|
||||
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)
|
||||
@ -118,7 +127,7 @@ else ()
|
||||
else ()
|
||||
message(FATAL_ERROR "Could not find CURL")
|
||||
endif ()
|
||||
include_directories(${CURL_INCLUDE_DIR} inc)
|
||||
include_directories(${CURL_INCLUDE_DIR})
|
||||
|
||||
message("")
|
||||
# libconfig
|
||||
@ -140,14 +149,26 @@ else ()
|
||||
include_directories(${LIBCONFIG_INCLUDE_DIRS})
|
||||
endif ()
|
||||
|
||||
|
||||
if (${GUI})
|
||||
set(CMAKE_AUTOMOC ON)
|
||||
set(CMAKE_INCLUDE_CURRENT_DIR ON)
|
||||
|
||||
find_package(Qt5Widgets REQUIRED)
|
||||
find_package(Qt5PrintSupport REQUIRED)
|
||||
find_package(Qt5Sql REQUIRED)
|
||||
endif ()
|
||||
|
||||
include_directories(inc)
|
||||
|
||||
message("")
|
||||
|
||||
#read sample config
|
||||
FILE(READ ${CMAKE_SOURCE_DIR}/config/dynuiprefresher.cfg SAMPLECONFIG)
|
||||
#add version header
|
||||
FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
|
||||
#add StaticData header
|
||||
FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/StaticData.h
|
||||
"/**
|
||||
* Version header to store Version, Config dir and a Sample config
|
||||
* 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
|
||||
@ -158,8 +179,9 @@ FILE(WRITE ${CMAKE_SOURCE_DIR}/inc/Version.h
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Version {
|
||||
namespace StaticData {
|
||||
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})\";
|
||||
@ -185,34 +207,112 @@ add_executable(${Application_Name} src/main.cpp)
|
||||
# LINK generated LIBS #
|
||||
target_link_libraries(${Application_Name} libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
|
||||
|
||||
if (${GUI})
|
||||
set(QT5_LIBRARIES Qt5::Widgets Qt5::PrintSupport Qt5::Sql)
|
||||
|
||||
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)
|
||||
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)
|
||||
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 .)
|
||||
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
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssh2-1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libstdc++-6.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libgcc_s_seh-1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libcrypto-1_1-x64.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libssl-1_1-x64.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libwinpthread-1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/zlib1.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libidn2-0.dll
|
||||
/usr/${TOOLCHAIN_PREFIX}/sys-root/mingw/bin/libconfig++-11.dll
|
||||
DESTINATION .)
|
||||
${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})
|
||||
@ -241,7 +341,7 @@ ${SAMPLECONFIG}EOM
|
||||
fi
|
||||
|
||||
systemctl enable ${Application_Name}.service
|
||||
systemctl start ${Application_Name}.service")
|
||||
systemctl restart ${Application_Name}.service")
|
||||
|
||||
|
||||
SET(CPACK_DEB_COMPONENT_INSTALL 1)
|
||||
@ -258,8 +358,19 @@ systemctl start ${Application_Name}.service")
|
||||
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_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")
|
||||
@ -269,7 +380,13 @@ systemctl start ${Application_Name}.service")
|
||||
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")
|
||||
@ -284,9 +401,37 @@ systemctl start ${Application_Name}.service")
|
||||
set(CPACK_GENERATOR NSIS)
|
||||
message(STATUS "Using NSIS Package build.")
|
||||
|
||||
set(CPACK_NSIS_testcomp_INSTALL_DIRECTORY /)
|
||||
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 ()
|
||||
|
||||
INCLUDE(CPack)
|
||||
@ -342,7 +487,7 @@ if (TESTS)
|
||||
# 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 libdynuiprefresher api ${CURL_LIBRARIES} ${LIBCONFIG++_LIBRARIES})
|
||||
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})
|
||||
|
||||
|
19
Docker/Linux/Dockerfile
Normal file
19
Docker/Linux/Dockerfile
Normal file
@ -0,0 +1,19 @@
|
||||
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"]
|
20
Docker/Windows/Dockerfile
Normal file
20
Docker/Windows/Dockerfile
Normal file
@ -0,0 +1,20 @@
|
||||
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"]
|
20
README.md
20
README.md
@ -2,6 +2,7 @@
|
||||
# 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).
|
||||
@ -31,6 +32,17 @@ help page:
|
||||
[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:
|
||||

|
||||
|
||||
Config Page:
|
||||

|
||||
|
||||
|
||||
## Build
|
||||
## Basic Build
|
||||
@ -85,6 +97,10 @@ 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
|
||||
@ -99,5 +115,7 @@ Optional dependencies
|
||||
* NSIS Pack tool (for creating installer)
|
||||
* doxygen (for generating html doc)
|
||||
|
||||
Some addition configuration of lib paths may be needed in CMakeList.txt.
|
||||
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.
|
||||
|
29
inc/Config.h
29
inc/Config.h
@ -18,6 +18,13 @@ public:
|
||||
*/
|
||||
static bool readConfig();
|
||||
|
||||
/**
|
||||
* save back configuration to file
|
||||
*
|
||||
* @return success of config write
|
||||
*/
|
||||
static bool saveConfig();
|
||||
|
||||
/**
|
||||
* validate config file
|
||||
*
|
||||
@ -63,12 +70,32 @@ public:
|
||||
*/
|
||||
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();
|
||||
Config() = default;
|
||||
|
||||
/**
|
||||
* helper variable for managing telegram Support
|
||||
|
@ -9,22 +9,25 @@
|
||||
|
||||
#pragma once
|
||||
|
||||
class IPRefresher {
|
||||
public:
|
||||
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;
|
||||
}
|
||||
|
||||
/**
|
||||
* refresh ip address on Dynu server
|
||||
*/
|
||||
void checkIPAdress(bool force);
|
||||
|
||||
/**
|
||||
* default constructor
|
||||
*/
|
||||
IPRefresher() = default;
|
||||
bool checkIPAdress(bool force);
|
||||
|
||||
/**
|
||||
* start the service in loop mode
|
||||
* every 5 minutes the ip is checked an refreshed (needed for .service)
|
||||
* @param loop true->loopmode on
|
||||
*/
|
||||
explicit IPRefresher(bool loop);
|
||||
};
|
||||
void startUpService(int interval = 300);
|
||||
}
|
@ -16,7 +16,7 @@ public:
|
||||
* @param ip ip address to test
|
||||
* @return validity
|
||||
*/
|
||||
static bool isIpValid(std::string ip);
|
||||
static bool isIpValid(const std::string& ip);
|
||||
|
||||
private:
|
||||
};
|
||||
|
63
inc/gui/MainWindow.h
Normal file
63
inc/gui/MainWindow.h
Normal file
@ -0,0 +1,63 @@
|
||||
/**
|
||||
* 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);
|
||||
};
|
@ -2,7 +2,7 @@
|
||||
Description=IP Refresher
|
||||
After=network.target
|
||||
[Service]
|
||||
ExecStart=iprefresher -l
|
||||
ExecStart=dynuiprefresher -l
|
||||
WorkingDirectory=/root
|
||||
StandardOutput=inherit
|
||||
StandardError=inherit
|
||||
|
@ -1,6 +1,6 @@
|
||||
#include "Config.h"
|
||||
#include "Logger.h"
|
||||
#include "Version.h"
|
||||
#include "StaticData.h"
|
||||
|
||||
#include <iostream>
|
||||
#include <cstring>
|
||||
@ -20,7 +20,7 @@ bool Config::telegramSupport;
|
||||
bool Config::readConfig() {
|
||||
libconfig::Config cfg;
|
||||
try {
|
||||
cfg.readFile(std::string(Version::ConfigDir + Version::ConfName).c_str());
|
||||
cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
|
||||
}
|
||||
catch (const libconfig::FileIOException &fioex) {
|
||||
std::cout << "I/O error while reading config file." << std::endl << "creating new config file!" << std::endl;
|
||||
@ -28,13 +28,14 @@ bool Config::readConfig() {
|
||||
// check if config folder exists
|
||||
struct stat info{};
|
||||
|
||||
if (stat(Version::ConfigDir.c_str(), &info) != 0) {
|
||||
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(Version::ConfigDir.c_str(), 777);
|
||||
int check = mkdir(StaticData::ConfigDir.c_str(), 777);
|
||||
#else
|
||||
int check = mkdir(Version::ConfigDir.c_str());
|
||||
int check = mkdir(StaticData::ConfigDir.c_str());
|
||||
#endif
|
||||
|
||||
// check if directory is created or not
|
||||
@ -51,9 +52,9 @@ bool Config::readConfig() {
|
||||
|
||||
|
||||
std::ofstream myfile;
|
||||
myfile.open(Version::ConfigDir + Version::ConfName);
|
||||
myfile.open(StaticData::ConfigDir + StaticData::ConfName);
|
||||
if (myfile.is_open()) {
|
||||
myfile << Version::SAMPLECONFIG;
|
||||
myfile << StaticData::SAMPLECONFIG;
|
||||
myfile.close();
|
||||
} else {
|
||||
Logger::error("error creating file");
|
||||
@ -90,11 +91,16 @@ bool Config::readConfig() {
|
||||
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(Version::ConfigDir.c_str());
|
||||
cfg.readFile(std::string(StaticData::ConfigDir + StaticData::ConfName).c_str());
|
||||
}
|
||||
catch (const libconfig::FileIOException &fioex) {
|
||||
Logger::warning("config file doesn't exist or permission denied!");
|
||||
@ -163,4 +169,14 @@ const std::string &Config::getChatId() {
|
||||
return chatId;
|
||||
}
|
||||
|
||||
Config::Config() = default;
|
||||
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;
|
||||
}
|
||||
|
@ -1,12 +1,13 @@
|
||||
#include "FileLogger.h"
|
||||
#include "IpHelper.h"
|
||||
#include "StaticData.h"
|
||||
|
||||
#include <fstream>
|
||||
#include <iostream>
|
||||
|
||||
void FileLogger::safeip(std::string ip) {
|
||||
std::ofstream out;
|
||||
out.open("ip.txt", std::ios::out);
|
||||
out.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::out);
|
||||
|
||||
out << ip;
|
||||
|
||||
@ -15,15 +16,12 @@ void FileLogger::safeip(std::string ip) {
|
||||
|
||||
std::string FileLogger::readip() {
|
||||
std::ifstream in;
|
||||
in.open("ip.txt", std::ios::in);
|
||||
in.open(StaticData::TempFilePath + "temp-dynuiprefresher.txt", std::ios::in);
|
||||
|
||||
std::string ip;
|
||||
|
||||
in >> ip;
|
||||
|
||||
// when received ip has no . return 0.0.0.0
|
||||
if (!IpHelper::isIpValid(ip))
|
||||
return "0.0.0.0";
|
||||
else
|
||||
return ip;
|
||||
return (IpHelper::isIpValid(ip) ? ip : "0.0.0.0");
|
||||
}
|
||||
|
@ -4,14 +4,14 @@
|
||||
#include "api/DynuAPI.h"
|
||||
#include "api/TelegramAPI.h"
|
||||
#include "Config.h"
|
||||
#include "Version.h"
|
||||
#include "StaticData.h"
|
||||
#include "IpHelper.h"
|
||||
|
||||
#include <chrono>
|
||||
#include <thread>
|
||||
#include <Logger.h>
|
||||
|
||||
void IPRefresher::checkIPAdress(bool force) {
|
||||
bool IPRefresher::checkIPAdress(bool force) {
|
||||
FileLogger logger;
|
||||
|
||||
IPAPI ipapi;
|
||||
@ -20,14 +20,17 @@ void 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);
|
||||
|
||||
@ -43,26 +46,26 @@ void IPRefresher::checkIPAdress(bool force) {
|
||||
} else if (!result) {
|
||||
//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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
IPRefresher::IPRefresher(bool loop) {
|
||||
if (loop) {
|
||||
Logger::message("startup of service");
|
||||
Logger::message("Version: " + Version::VERSION);
|
||||
void IPRefresher::startUpService(int interval) {
|
||||
Logger::message("startup of service");
|
||||
Logger::message("Version: " + StaticData::VERSION);
|
||||
|
||||
while (true) {
|
||||
Logger::message("starting check");
|
||||
if (Config::readConfig()) {
|
||||
checkIPAdress(false);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(300000));
|
||||
while (true) {
|
||||
Logger::message("starting check");
|
||||
if (Config::readConfig()) {
|
||||
checkIPAdress(false);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
std::this_thread::sleep_for(std::chrono::milliseconds(interval * 1000));
|
||||
}
|
||||
}
|
||||
|
@ -1,7 +1,7 @@
|
||||
#include <regex>
|
||||
#include "IpHelper.h"
|
||||
|
||||
#include <climits>
|
||||
|
||||
bool IpHelper::isIpValid(std::string ip) {
|
||||
return (ip.find('.') != ULONG_MAX);
|
||||
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));
|
||||
}
|
||||
|
@ -1,5 +1,11 @@
|
||||
#include <IpHelper.h>
|
||||
#include <Logger.h>
|
||||
#include "api/IPAPI.h"
|
||||
|
||||
std::string IPAPI::getGlobalIp() {
|
||||
return request("https://api.ipify.org");
|
||||
const std::string ip = request("https://api.ipify.org");
|
||||
if(!IpHelper::isIpValid(ip))
|
||||
Logger::warning("no valid ip returned from ipapi");
|
||||
|
||||
return ip;
|
||||
}
|
@ -1,8 +1,6 @@
|
||||
#include "api/TelegramAPI.h"
|
||||
#include "Logger.h"
|
||||
|
||||
#include <climits>
|
||||
|
||||
int TelegramAPI::sendMessage(const std::string &text) {
|
||||
Hashmap<std::string, std::string> args;
|
||||
args.add("chat_id", chatid);
|
||||
@ -12,8 +10,8 @@ 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\"") != ULONG_MAX) {
|
||||
Logger::error("failed to refresh the ip (Dynu API)");
|
||||
if (reply.find("\"error_code\"") != SIZE_MAX) {
|
||||
Logger::error("failed to send the Telegram Message");
|
||||
return -1;
|
||||
}
|
||||
return 1;
|
||||
|
129
src/gui/MainWindow.cpp
Normal file
129
src/gui/MainWindow.cpp
Normal file
@ -0,0 +1,129 @@
|
||||
#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);
|
||||
}
|
||||
}
|
320
src/gui/mainwindow.ui
Normal file
320
src/gui/mainwindow.ui
Normal file
@ -0,0 +1,320 @@
|
||||
<?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>
|
12
src/main.cpp
12
src/main.cpp
@ -1,4 +1,4 @@
|
||||
#include "Version.h"
|
||||
#include "StaticData.h"
|
||||
#include "IPRefresher.h"
|
||||
#include "Logger.h"
|
||||
#include "Config.h"
|
||||
@ -19,17 +19,16 @@ int main(int argc, char *argv[]) {
|
||||
<< "[-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 " << Version::VERSION << std::endl;
|
||||
std::cout << "Version " << StaticData::VERSION << std::endl;
|
||||
} else if (firstarg == "-f" || firstarg == "--force") {
|
||||
IPRefresher ipr;
|
||||
if (Config::readConfig()) {
|
||||
ipr.checkIPAdress(true);
|
||||
IPRefresher::checkIPAdress(true);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
|
||||
} else if (firstarg == "-l" || firstarg == "--loop") {
|
||||
IPRefresher(true);
|
||||
IPRefresher::startUpService(600);
|
||||
} else if (firstarg == "-c" || firstarg == "--checkconfig") {
|
||||
if (Config::validateConfig()) {
|
||||
Logger::message("Config file is OK");
|
||||
@ -44,10 +43,9 @@ int main(int argc, char *argv[]) {
|
||||
Logger::message("wrong arguments! -h for help");
|
||||
}
|
||||
} else {
|
||||
IPRefresher ipr;
|
||||
Logger::message("starting check");
|
||||
if (Config::readConfig()) {
|
||||
ipr.checkIPAdress(false);
|
||||
IPRefresher::checkIPAdress(false);
|
||||
} else {
|
||||
std::cout << "incorrect credentials!" << std::endl;
|
||||
}
|
||||
|
14
src/maingui.cpp
Normal file
14
src/maingui.cpp
Normal file
@ -0,0 +1,14 @@
|
||||
#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();
|
||||
}
|
@ -4,7 +4,6 @@
|
||||
|
||||
#include <FileLogger.h>
|
||||
#include <api/IPAPI.h>
|
||||
#include <climits>
|
||||
#include "gtest/gtest.h"
|
||||
|
||||
/**
|
||||
@ -21,7 +20,7 @@ TEST(ReadIp, testzeroIpIfNotExists) {
|
||||
TEST(IPAPI, testIpAPIcheckIPSyntax) {
|
||||
IPAPI ipapi;
|
||||
std::string ip = ipapi.getGlobalIp();
|
||||
if (ip.find('.') == ULONG_MAX) {
|
||||
if (ip.find('.') == SIZE_MAX) {
|
||||
// error when ip doesn't contain a .
|
||||
ASSERT_TRUE(false);
|
||||
} else {
|
||||
|
Loading…
x
Reference in New Issue
Block a user