From bb0331ed57fad59a677a9ebe7229023eec564677 Mon Sep 17 00:00:00 2001 From: "Vyacheslav N. Boyko" Date: Tue, 9 Jan 2018 12:01:55 +0300 Subject: [PATCH] calculator listener reworked with FSM, project packaging change from gradle to maven --- .gitignore | 1 + ...erxml_jackson_core_jackson_core_2_8_10.xml | 9 + ...le_api_client_google_api_client_1_23_0.xml | 11 + ..._services_customsearch_v1_rev57_1_23_0.xml | 11 + ..._com_google_code_findbugs_jsr305_1_3_9.xml | 9 + ...adle__com_google_guava_guava_jdk5_17_0.xml | 11 + ..._http_client_google_http_client_1_23_0.xml | 11 + ...ent_google_http_client_jackson2_1_23_0.xml | 11 + ...auth_client_google_oauth_client_1_23_0.xml | 11 + ...__org_apache_commons_commons_lang3_3_7.xml | 11 + ...apache_httpcomponents_httpclient_4_5_3.xml | 11 + ...g_apache_httpcomponents_httpcore_4_4_8.xml | 11 + .../Gradle__org_jsoup_jsoup_1_10_3.xml | 9 + build.gradle | 78 ------ gradlew | 172 -------------- gradlew.bat | 84 ------- jircbot.iml | 59 +++++ pom.xml | 138 +++++++++++ settings.gradle | 2 - .../java/ru/bvn13/jircbot/bot/JircBot.java | 5 +- .../jircbot/config/JircBotConfiguration.java | 6 +- .../jircbot/listeners/CalculatorListener.java | 107 --------- .../calculator/CalculatorDialog.java | 224 ++++++++++++++++++ .../calculator/CalculatorListener.java | 50 ++++ src/main/resources/logback.xml | 29 +-- 25 files changed, 616 insertions(+), 465 deletions(-) create mode 100644 .idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_10.xml create mode 100644 .idea/libraries/Gradle__com_google_api_client_google_api_client_1_23_0.xml create mode 100644 .idea/libraries/Gradle__com_google_apis_google_api_services_customsearch_v1_rev57_1_23_0.xml create mode 100644 .idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml create mode 100644 .idea/libraries/Gradle__com_google_guava_guava_jdk5_17_0.xml create mode 100644 .idea/libraries/Gradle__com_google_http_client_google_http_client_1_23_0.xml create mode 100644 .idea/libraries/Gradle__com_google_http_client_google_http_client_jackson2_1_23_0.xml create mode 100644 .idea/libraries/Gradle__com_google_oauth_client_google_oauth_client_1_23_0.xml create mode 100644 .idea/libraries/Gradle__org_apache_commons_commons_lang3_3_7.xml create mode 100644 .idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_3.xml create mode 100644 .idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_8.xml create mode 100644 .idea/libraries/Gradle__org_jsoup_jsoup_1_10_3.xml delete mode 100644 build.gradle delete mode 100644 gradlew delete mode 100644 gradlew.bat create mode 100644 jircbot.iml create mode 100644 pom.xml delete mode 100644 settings.gradle delete mode 100644 src/main/java/ru/bvn13/jircbot/listeners/CalculatorListener.java create mode 100644 src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorDialog.java create mode 100644 src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java diff --git a/.gitignore b/.gitignore index 217e145..5a086d4 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ build/* google-search.txt yandex-search.txt +target diff --git a/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_10.xml b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_10.xml new file mode 100644 index 0000000..7576196 --- /dev/null +++ b/.idea/libraries/Gradle__com_fasterxml_jackson_core_jackson_core_2_8_10.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_api_client_google_api_client_1_23_0.xml b/.idea/libraries/Gradle__com_google_api_client_google_api_client_1_23_0.xml new file mode 100644 index 0000000..fa56de1 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_api_client_google_api_client_1_23_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_apis_google_api_services_customsearch_v1_rev57_1_23_0.xml b/.idea/libraries/Gradle__com_google_apis_google_api_services_customsearch_v1_rev57_1_23_0.xml new file mode 100644 index 0000000..89279f4 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_apis_google_api_services_customsearch_v1_rev57_1_23_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml new file mode 100644 index 0000000..dd2b251 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_1_3_9.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_guava_guava_jdk5_17_0.xml b/.idea/libraries/Gradle__com_google_guava_guava_jdk5_17_0.xml new file mode 100644 index 0000000..096ecf0 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_guava_guava_jdk5_17_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_http_client_google_http_client_1_23_0.xml b/.idea/libraries/Gradle__com_google_http_client_google_http_client_1_23_0.xml new file mode 100644 index 0000000..90b1581 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_http_client_google_http_client_1_23_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_http_client_google_http_client_jackson2_1_23_0.xml b/.idea/libraries/Gradle__com_google_http_client_google_http_client_jackson2_1_23_0.xml new file mode 100644 index 0000000..e11f4dc --- /dev/null +++ b/.idea/libraries/Gradle__com_google_http_client_google_http_client_jackson2_1_23_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_oauth_client_google_oauth_client_1_23_0.xml b/.idea/libraries/Gradle__com_google_oauth_client_google_oauth_client_1_23_0.xml new file mode 100644 index 0000000..e4352c0 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_oauth_client_google_oauth_client_1_23_0.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_7.xml b/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_7.xml new file mode 100644 index 0000000..c86ace6 --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_commons_commons_lang3_3_7.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_3.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_3.xml new file mode 100644 index 0000000..abf552a --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpclient_4_5_3.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_8.xml b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_8.xml new file mode 100644 index 0000000..0b54f3c --- /dev/null +++ b/.idea/libraries/Gradle__org_apache_httpcomponents_httpcore_4_4_8.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_3.xml b/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_3.xml new file mode 100644 index 0000000..4ce41c9 --- /dev/null +++ b/.idea/libraries/Gradle__org_jsoup_jsoup_1_10_3.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle deleted file mode 100644 index fd7aba7..0000000 --- a/build.gradle +++ /dev/null @@ -1,78 +0,0 @@ -apply plugin: 'java' -apply plugin: 'idea' -apply plugin: "org.springframework.boot" - - -group 'ru.bvn13.jircbot' -version '1.0-SNAPSHOT' - -apply plugin: 'java' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 - - -repositories { - mavenLocal() - jcenter() - mavenCentral() - - maven { url 'http://repo.spring.io/libs-release' } - maven { url "http://repo.springsource.org/repo" } -} - - -bootRun { - systemProperties = System.properties -} - - -configurations { - all*.exclude module: 'spring-boot-starter-logging' -} - - -dependencies { - // PircBot: https://github.com/TheLQ/pircbotx/wiki/Documentation - compile("org.pircbotx:pircbotx:2.1") - - // Spring - compile(group: 'org.springframework.boot', name: 'spring-boot-starter', version:'1.5.8.RELEASE') { - exclude(module: 'spring-boot-starter-logging') - } - compile 'org.springframework.boot:spring-boot-starter-log4j2:1.5.8.RELEASE' - - // lombok - compileOnly 'org.projectlombok:lombok:1.16.18' - - // JSON - compile 'com.googlecode.json-simple:json-simple:1.1.1' - - // Calculator - compile 'net.objecthunter:exp4j:0.4.8' - - // HTML parser - compile 'org.jsoup:jsoup:1.10.3' - - // Google API - compile 'com.google.apis:google-api-services-customsearch:v1-rev57-1.23.0' - - // Logging - compile 'ch.qos.logback:logback-classic:1.2.3' - compile 'org.slf4j:slf4j-api:1.7.25' - compile 'org.apache.commons:commons-lang3:+' - - testCompile group: 'junit', name: 'junit', version: '4.12' -} - - -buildscript { - repositories { - maven { - url "https://plugins.gradle.org/m2/" - } - } - dependencies { - classpath "org.springframework.boot:spring-boot-gradle-plugin:1.5.8.RELEASE" - } -} \ No newline at end of file diff --git a/gradlew b/gradlew deleted file mode 100644 index 4453cce..0000000 --- a/gradlew +++ /dev/null @@ -1,172 +0,0 @@ -#!/usr/bin/env sh - -############################################################################## -## -## Gradle start up script for UN*X -## -############################################################################## - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null - -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` - -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" - -# Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" - -warn ( ) { - echo "$*" -} - -die ( ) { - echo - echo "$*" - echo - exit 1 -} - -# OS specific support (must be 'true' or 'false'). -cygwin=false -msys=false -darwin=false -nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; -esac - -CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar - -# Determine the Java command to use to start the JVM. -if [ -n "$JAVA_HOME" ] ; then - if [ -x "$JAVA_HOME/jre/sh/java" ] ; then - # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" - else - JAVACMD="$JAVA_HOME/bin/java" - fi - if [ ! -x "$JAVACMD" ] ; then - die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." - fi -else - JAVACMD="java" - which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. - -Please set the JAVA_HOME variable in your environment to match the -location of your Java installation." -fi - -# Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi -fi - -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi - -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi - # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" - fi - i=$((i+1)) - done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac -fi - -# Escape application args -save ( ) { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - -exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat deleted file mode 100644 index f955316..0000000 --- a/gradlew.bat +++ /dev/null @@ -1,84 +0,0 @@ -@if "%DEBUG%" == "" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init - -echo. -echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto init - -echo. -echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% -echo. -echo Please set the JAVA_HOME variable in your environment to match the -echo location of your Java installation. - -goto fail - -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% - -:end -@rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega diff --git a/jircbot.iml b/jircbot.iml new file mode 100644 index 0000000..7d8a76f --- /dev/null +++ b/jircbot.iml @@ -0,0 +1,59 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..8d39351 --- /dev/null +++ b/pom.xml @@ -0,0 +1,138 @@ + + + 4.0.0 + + ru.bvn13 + jircbot + 1.0-SNAPSHOT + + + + 1.8 + UTF-8 + UTF-8 + 1.8 + 1.8 + + + + + FinalStateMachine-mvn-repo + https://raw.github.com/bvn13/FinalStateMachine/mvn-repo/ + + true + always + + + + + + + + + + org.pircbotx + pircbotx + 2.1 + + + + + + org.springframework.boot + spring-boot-starter + 1.5.9.RELEASE + + + org.springframework.boot + spring-boot-starter-logging + + + + + + + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + + + net.objecthunter + exp4j + 0.4.8 + + + + + org.jsoup + jsoup + 1.11.2 + + + + + com.google.apis + google-api-services-customsearch + v1-rev57-1.23.0 + + + + + ch.qos.logback + logback-classic + 1.2.3 + + + ch.qos.logback + logback-core + 1.2.3 + + + org.slf4j + slf4j-api + 1.7.25 + + + org.apache.commons + commons-lang3 + 3.7 + + + + + + ru.bvn13 + fsm + 1.0 + + + + + + org.projectlombok + lombok + 1.16.16 + + + + + + junit + junit + 4.12 + + + + + + \ No newline at end of file diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 6d6f01a..0000000 --- a/settings.gradle +++ /dev/null @@ -1,2 +0,0 @@ -rootProject.name = 'jircbot' - diff --git a/src/main/java/ru/bvn13/jircbot/bot/JircBot.java b/src/main/java/ru/bvn13/jircbot/bot/JircBot.java index 2eeb86f..30e296c 100644 --- a/src/main/java/ru/bvn13/jircbot/bot/JircBot.java +++ b/src/main/java/ru/bvn13/jircbot/bot/JircBot.java @@ -13,6 +13,7 @@ import org.springframework.stereotype.Component; import ru.bvn13.jircbot.Services.YandexSearchService; import ru.bvn13.jircbot.config.JircBotConfiguration; import ru.bvn13.jircbot.listeners.*; +import ru.bvn13.jircbot.listeners.calculator.CalculatorListener; import javax.annotation.PostConstruct; import java.util.ArrayList; @@ -64,9 +65,9 @@ public class JircBot extends ListenerAdapter { .addListener(new CalculatorListener()) //This class is a listener, so add it to the bots known listeners .addListener(new GoogleDoodleListener(this.config)) //.addListener(new GoogleSearchListener(this.config)) - .addListener(new UrlRetrieverListener()) + //.addListener(new UrlRetrieverListener()) .addListener(new RegexCheckerListener()) - .addListener(new YandexSearchListener(this.config, this.yandexSearchService)) + //.addListener(new YandexSearchListener(this.config, this.yandexSearchService)) .setServers(servers) .setAutoReconnect(true) //.addAutoJoinChannel(c.getChannelName()) //Join the official #pircbotx channel diff --git a/src/main/java/ru/bvn13/jircbot/config/JircBotConfiguration.java b/src/main/java/ru/bvn13/jircbot/config/JircBotConfiguration.java index 3817cc7..a4a747b 100644 --- a/src/main/java/ru/bvn13/jircbot/config/JircBotConfiguration.java +++ b/src/main/java/ru/bvn13/jircbot/config/JircBotConfiguration.java @@ -9,8 +9,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Configuration; -import ru.bvn13.jircbot.listeners.GoogleDoodleListener; -import ru.bvn13.jircbot.listeners.YandexSearchListener; import ru.bvn13.jircbot.model.*; import javax.annotation.PostConstruct; @@ -62,7 +60,7 @@ public class JircBotConfiguration { } JSONObject lstnrSettings = (JSONObject) jsonObject.get("settings"); - this.listenersSettings.put(KEY_GOOGLE_DOODLE, this.readGoogleDoodleSettins(lstnrSettings)); + this.listenersSettings.put(KEY_GOOGLE_DOODLE, this.readGoogleDoodleSettings(lstnrSettings)); this.listenersSettings.put(KEY_GOOGLE_SEARCH, this.readGoogleSearchSettings(lstnrSettings)); this.listenersSettings.put(KEY_YANDEX_SEARCH, this.readYandexSearchSettings(lstnrSettings)); @@ -104,7 +102,7 @@ public class JircBotConfiguration { return config; } - private ListenerSettings readGoogleDoodleSettins(JSONObject data) { + private ListenerSettings readGoogleDoodleSettings(JSONObject data) { GoogleDoodleSettings sets = new GoogleDoodleSettings(); JSONObject googleSets = (JSONObject) data.get("doodle"); sets.setMainUrl((String) googleSets.get("mainUrl")); diff --git a/src/main/java/ru/bvn13/jircbot/listeners/CalculatorListener.java b/src/main/java/ru/bvn13/jircbot/listeners/CalculatorListener.java deleted file mode 100644 index 6f41773..0000000 --- a/src/main/java/ru/bvn13/jircbot/listeners/CalculatorListener.java +++ /dev/null @@ -1,107 +0,0 @@ -package ru.bvn13.jircbot.listeners; - -import net.objecthunter.exp4j.Expression; -import net.objecthunter.exp4j.ExpressionBuilder; -import org.pircbotx.hooks.ListenerAdapter; -import org.pircbotx.hooks.WaitForQueue; -import org.pircbotx.hooks.events.MessageEvent; -import org.pircbotx.hooks.types.GenericMessageEvent; - - - -public class CalculatorListener extends ListenerAdapter { - - private static final String COMMAND = "?calc "; - - - @Override - public void onGenericMessage(final GenericMessageEvent event) throws Exception { - - if (event.getUser().getUserId().equals(event.getBot().getUserBot().getUserId())) { - return; - } - - if (!event.getMessage().startsWith(COMMAND.trim())) { - return; - } - - String message = event.getMessage().replace(COMMAND, "").trim(); - String[] commands = message.split(" ", 2); - - if (commands.length == 0 || commands[0].isEmpty() || commands[0].trim().equalsIgnoreCase("help")) { - event.respond(this.helpMessage()); - return; - } - - if (this.checkComand(commands[0].trim())) { - return; - } - - String expressionString = message; - event.respond("EXPRESSION: "+expressionString); - ExpressionBuilder expressionBuilder = new ExpressionBuilder(expressionString); - Expression exp = null; - - WaitForQueue queue = new WaitForQueue(event.getBot()); - while (true) { - - MessageEvent currentEvent = queue.waitFor(MessageEvent.class); - - if (currentEvent.getMessage().startsWith(COMMAND)) { - message = currentEvent.getMessage().replace(COMMAND, "").trim(); - commands = message.split(" ", 2); - if (commands.length == 0 || commands[0].isEmpty()) { - currentEvent.respond("Command is expected."); - currentEvent.respond(this.helpMessage()); - } else if (commands[0].trim().equalsIgnoreCase("vars")) { - exp = expressionBuilder.variables(commands[1].trim()).build(); - currentEvent.respond("VARIABLES: "+commands[1].trim()); - } else if (commands[0].trim().equalsIgnoreCase("set")) { - String[] variableData = commands[1].trim().split("=", 2); - if (variableData.length < 2 || variableData[0].isEmpty() || variableData[1].isEmpty()) { - currentEvent.respond("FORMAT: variable = value"); - } else { - if (exp == null) { - //currentEvent.respond("Variables are not set!"); - exp = expressionBuilder.build(); - } else { - Double value = Double.parseDouble(variableData[1].trim()); - exp = exp.setVariable(variableData[0].trim(), value); - currentEvent.respond(String.format("VARIABLE SET: %s = %f", variableData[0].trim(), value)); - } - } - } else if (commands[0].trim().equalsIgnoreCase("done")) { - if (exp == null) { - exp = expressionBuilder.build(); - } - Double result = exp.evaluate(); - currentEvent.respond(String.format("%s = %f", expressionString, result)); - expressionBuilder = null; - exp = null; - queue.close(); - return; - } else { - currentEvent.respond(this.helpMessage()); - } - } - - } - - } - - - private Boolean checkComand(String command) { - return command.equalsIgnoreCase("vars") - || command.equalsIgnoreCase("set") - || command.equalsIgnoreCase("done"); - } - - private String helpMessage() { - return "CALCULATOR (powered by Exp4J) | "+ - "Commands: | "+ - "vars - set variables names delimetered by comma, i.e.: a, b | "+ - "set - set variable, i.e.: a = 2 | "+ - "done - evaluate expression"; - } - -} diff --git a/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorDialog.java b/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorDialog.java new file mode 100644 index 0000000..9d968b0 --- /dev/null +++ b/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorDialog.java @@ -0,0 +1,224 @@ +package ru.bvn13.jircbot.listeners.calculator; + +import lombok.Data; +import net.objecthunter.exp4j.Expression; +import net.objecthunter.exp4j.ExpressionBuilder; +import org.pircbotx.hooks.types.GenericMessageEvent; +import ru.bvn13.fsm.Condition; +import ru.bvn13.fsm.Exceptions.FSMException; +import ru.bvn13.fsm.Exceptions.NotInitedException; +import ru.bvn13.fsm.FSM; +import ru.bvn13.fsm.State; + +/** + * Created by bvn13 on 03.01.2018. + */ +@Data +public class CalculatorDialog extends FSM { + + public static final String COMMAND = "?calc "; + + private String command; + private String[] commands; + private GenericMessageEvent event; + + private String expression; + private ExpressionBuilder expressionBuilder; + private Expression exp = null; + + public static CalculatorDialog createDialog() throws FSMException { + + CalculatorDialog dialog = new CalculatorDialog(); + + dialog.initState(new State("init") { + @Override + public void process() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.expression = dialog.command; + dialog.expressionBuilder = new ExpressionBuilder(dialog.expression); + dialog.event.respond("inited, expression: "+dialog.expression); + } + }); + + dialog.addTransition("init", new State("entering-vars") { + @Override + public void beforeEvent() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.event.respond("please enter variables (comma separated)"); + } + @Override + public void process() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.enteringVars(); + } + }); + + dialog.addTransition("entering-vars", new State("settings-vars") { + @Override + public void beforeEvent() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.event.respond("please set variable"); + } + @Override + public void process() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.settingVars(); + } + }, new Condition() { + @Override + public boolean check() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + return dialog.commands[0].equalsIgnoreCase("vars"); + } + }); + + dialog.addTransition("settings-vars", "settings-vars", new Condition() { + @Override + public boolean check() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + return !dialog.commands[0].equalsIgnoreCase("done"); + } + }); + + dialog.addTransition("settings-vars", new State("calculating", true) { + @Override + public void process() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.calculating(); + } + }, new Condition() { + @Override + public boolean check() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + return dialog.commands[0].equalsIgnoreCase("done"); + } + }); + + dialog.addTransition("entering-vars", "calculating", new Condition() { + @Override + public boolean check() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + return dialog.commands[0].equalsIgnoreCase("done"); + } + }); + + dialog.addTransition("entering-vars", new State("helping-entering-vars") { + @Override + public void process() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + dialog.event.respond(dialog.helpMessage()); + //dialog.event.respond("Please set vars"); + try { + dialog.next(); + } catch (FSMException e) { + e.printStackTrace(); + } + } + }, new Condition() { + @Override + public boolean check() { + CalculatorDialog dialog = ((CalculatorDialog)this.getFSM()); + return !dialog.commands[0].equalsIgnoreCase("done") + && !dialog.commands[0].equalsIgnoreCase("vars"); + } + }); + + dialog.addTransition("helping-entering-vars", "entering-vars"); + + return dialog; + + } + + private void enteringVars() { + exp = expressionBuilder.variables(commands[1].trim()).build(); + event.respond("VARIABLES: "+commands[1].trim()); + } + + private void settingVars() { + String[] variableData = commands[1].trim().split("=", 2); + if (variableData.length < 2 || variableData[0].isEmpty() || variableData[1].isEmpty()) { + event.respond("FORMAT: variable = value"); + } else { + if (exp == null) { + //currentEvent.respond("Variables are not set!"); + exp = expressionBuilder.build(); + } else { + Double value = Double.parseDouble(variableData[1].trim()); + exp = exp.setVariable(variableData[0].trim(), value); + event.respond(String.format("VARIABLE SET: %s = %f", variableData[0].trim(), value)); + } + } + } + + private void calculating() { + if (exp == null) { + exp = expressionBuilder.build(); + } + Double result = exp.evaluate(); + event.respond(String.format("%s = %f", expression, result)); + expressionBuilder = null; + exp = null; + return; + } + + public void setEvent(GenericMessageEvent event) { + this.event = event; + } + + + public void processCommand(String userMessage) { + + if (prepareCommand(userMessage)) { + return; + } + + if (this.getCurrentState()==null || this.getCurrentState().isFinish()) { + try { + this.init(); + } catch (NotInitedException e) { + e.printStackTrace(); + } + } + + try { + this.next(); + } catch (FSMException e) { + e.printStackTrace(); + } + + } + + + + private boolean prepareCommand(String userMessage) { + String message = userMessage.replace(COMMAND, "").trim(); + this.commands = message.split(" ", 2); + + if (commands.length == 0 || commands[0].isEmpty() || commands[0].trim().equalsIgnoreCase("help")) { + event.respond(this.helpMessage()); + return true; + } + + if (this.checkComand(commands[0].trim())) { + return false; + } + + this.command = message; + return false; + } + + private String helpMessage() { + return "CALCULATOR (powered by Exp4J) | "+ + "Commands: | "+ + "vars - set variables names delimetered by comma, i.e.: a, b | "+ + "set - set variable, i.e.: a = 2 | "+ + "done - evaluate expression"; + } + + private Boolean checkComand(String command) { + return command.equalsIgnoreCase("vars") + || command.equalsIgnoreCase("set") + || command.equalsIgnoreCase("done"); + } + +} diff --git a/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java b/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java new file mode 100644 index 0000000..fecb9f0 --- /dev/null +++ b/src/main/java/ru/bvn13/jircbot/listeners/calculator/CalculatorListener.java @@ -0,0 +1,50 @@ +package ru.bvn13.jircbot.listeners.calculator; + +import net.objecthunter.exp4j.Expression; +import net.objecthunter.exp4j.ExpressionBuilder; +import org.pircbotx.hooks.ListenerAdapter; +import org.pircbotx.hooks.WaitForQueue; +import org.pircbotx.hooks.events.MessageEvent; +import org.pircbotx.hooks.types.GenericMessageEvent; + +import java.util.HashMap; +import java.util.Map; +import java.util.UUID; + + +public class CalculatorListener extends ListenerAdapter { + + + + private Map dialogs = new HashMap<>(); + + + @Override + public void onGenericMessage(final GenericMessageEvent event) throws Exception { + + if (event.getUser().getUserId().equals(event.getBot().getUserBot().getUserId())) { + return; + } + + if (!event.getMessage().startsWith(CalculatorDialog.COMMAND.trim())) { + return; + } + + CalculatorDialog dialog = null; + if (this.dialogs.containsKey(event.getUser().getUserId())) { + dialog = this.dialogs.get(event.getUser().getUserId()); + } else { + dialog = CalculatorDialog.createDialog(); + this.dialogs.put(event.getUser().getUserId(), dialog); + } + dialog.setEvent(event); + dialog.processCommand(event.getMessage()); + + } + + + + + + +} diff --git a/src/main/resources/logback.xml b/src/main/resources/logback.xml index 6c1834f..2a2c31b 100644 --- a/src/main/resources/logback.xml +++ b/src/main/resources/logback.xml @@ -11,24 +11,21 @@ + + + + + + + + + + + + + - - - - - - - - - - - - - - - -