This commit is contained in:
Timo Ley 2020-09-27 18:18:10 +02:00
commit 0ea846267f
16 changed files with 690 additions and 0 deletions

3
.gitignore vendored Normal file
View file

@ -0,0 +1,3 @@
.gradle
.idea
build

39
build.gradle Normal file
View file

@ -0,0 +1,39 @@
plugins {
id 'java'
id "edu.sc.seis.launch4j" version "2.4.8"
id "com.github.johnrengelman.shadow" version "5.2.0"
}
group 'ley.jmclient'
version '1.0-SNAPSHOT'
repositories {
mavenCentral()
}
dependencies {
compile group: 'com.google.code.gson', name: 'gson', version: '2.8.6'
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.12'
compile group: 'org.apache.httpcomponents', name: 'httpmime', version: '4.5.3'
testCompile group: 'junit', name: 'junit', version: '4.12'
}
jar {
manifest {
attributes 'Main-Class': 'ley.jmclient.Main'
}
}
shadowJar {
classifier = ''
}
launch4j {
mainClassName = 'ley.jmclient.Main'
icon = "${projectDir}/src/main/resources/icon.ico"
}
build {
dependsOn tasks.shadowJar
dependsOn tasks.launch4j
}

BIN
gradle/wrapper/gradle-wrapper.jar vendored Normal file

Binary file not shown.

View file

@ -0,0 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

185
gradlew vendored Normal file
View file

@ -0,0 +1,185 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or authors.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# https://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#
##############################################################################
##
## 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='"-Xmx64m" "-Xms64m"'
# 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 or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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=`expr $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"
exec "$JAVACMD" "$@"

104
gradlew.bat vendored Normal file
View file

@ -0,0 +1,104 @@
@rem
@rem Copyright 2015 the original author or authors.
@rem
@rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at
@rem
@rem https://www.apache.org/licenses/LICENSE-2.0
@rem
@rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and
@rem limitations under the License.
@rem
@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 Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@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="-Xmx64m" "-Xms64m"
@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

2
settings.gradle Normal file
View file

@ -0,0 +1,2 @@
rootProject.name = 'JMClient'

View file

@ -0,0 +1,187 @@
package ley.jmclient;
import javafx.application.HostServices;
import javafx.application.Platform;
import javafx.event.ActionEvent;
import javafx.scene.Node;
import javafx.scene.control.*;
import javafx.stage.FileChooser;
import ley.jmclient.model.Category;
import ley.jmclient.model.CategoryResponse;
import ley.jmclient.model.UploadResponse;
import java.io.*;
public class Controller {
public ChoiceBox<Category> boxCat;
public Label lblCat;
public Label lblTok;
public TextField txTok;
public Button btnSave;
public Button btnReload;
public Label lblFile;
public Button btnFile;
public Label lblSel;
public Button btnUpload;
File selection = null;
String token;
String category;
HostServices serv;
public Controller() {
reload();
loadToken();
}
public void setHostServices(HostServices serv) {
this.serv = serv;
}
public void reload() {
Platform.runLater(new Runnable() {
@Override
public void run() {
boxCat.setVisible(false);
}
});
new Thread(new Runnable() {
@Override
public void run() {
try {
CategoryResponse res = HTTPClient.categories();
Platform.runLater(new Runnable() {
@Override
public void run() {
boxCat.getItems().clear();
for (Category c : res.categories) {
boxCat.getItems().add(c);
}
boxCat.setVisible(true);
}
});
} catch (IOException e) {
Platform.runLater(new Runnable() {
@Override
public void run() {
showError(e.getLocalizedMessage());
}
});
}
}
}).start();
}
public void chooseFile(ActionEvent event) {
FileChooser fc = new FileChooser();
fc.setTitle("Choose Meme");
Node source = (Node) event.getSource();
selection = fc.showOpenDialog(source.getScene().getWindow());
lblSel.setText(selection.getAbsolutePath());
}
public void upload(ActionEvent event) {
if (selection != null) {
if (boxCat.getValue() != null) {
category = boxCat.getValue().id;
token = txTok.getText();
btnUpload.setDisable(true);
btnUpload.setVisible(false);
new Thread(new Runnable() {
@Override
public void run() {
try {
UploadResponse res = HTTPClient.upload(token, category, selection);
Platform.runLater(new Runnable() {
@Override
public void run() {
btnUpload.setDisable(false);
btnUpload.setVisible(true);
if (res.status != 201) {
showError(res.error);
} else {
Alert alert = new Alert(Alert.AlertType.INFORMATION);
alert.setTitle("Upload Complete");
alert.setHeaderText("Meme uploaded");
alert.setContentText(res.files.get(0));
alert.showAndWait();
if (serv != null) {
serv.showDocument(res.files.get(0));
}
}
}
});
} catch (IOException e) {
showError(e.getLocalizedMessage());
}
}
}).start();
} else {
showError("No category selected");
}
} else {
showError("No file selected to upload");
}
}
public void saveToken() {
File tokfile = new File(System.getProperty("user.home") + "/.jmclient/token");
token = txTok.getText();
new Thread(new Runnable() {
@Override
public void run() {
tokfile.getParentFile().mkdirs();
try {
BufferedWriter writer = new BufferedWriter(new FileWriter(tokfile));
writer.write(token);
writer.close();
} catch (IOException e) {
Platform.runLater(new Runnable() {
@Override
public void run() {
showError(e.getLocalizedMessage());
}
});
}
}
}).start();
}
public void loadToken() {
File tokfile = new File(System.getProperty("user.home") + "/.jmclient/token");
new Thread(new Runnable() {
@Override
public void run() {
if (tokfile.exists()) {
try {
BufferedReader br = new BufferedReader(new FileReader(tokfile));
token = br.readLine();
Platform.runLater(new Runnable() {
@Override
public void run() {
txTok.setText(token);
}
});
} catch (IOException e) {
Platform.runLater(new Runnable() {
@Override
public void run() {
showError(e.getLocalizedMessage());
}
});
}
}
}
}).start();
}
public void showError(String msg) {
Alert alert = new Alert(Alert.AlertType.ERROR);
alert.setTitle("Error");
alert.setHeaderText("Error:");
alert.setContentText(msg);
alert.showAndWait();
}
}

View file

@ -0,0 +1,39 @@
package ley.jmclient;
import ley.jmclient.model.CategoryResponse;
import ley.jmclient.model.UploadResponse;
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.mime.MultipartEntityBuilder;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import java.io.File;
import java.io.IOException;
public class HTTPClient {
public static String UploadURL = "https://data.tilera.xyz/api/jensmemes/upload";
public static String CategoryURL = "https://data.tilera.xyz/api/jensmemes/categories";
public static UploadResponse upload(String token, String category, File image) throws IOException {
CloseableHttpClient client = HttpClients.createDefault();
HttpPost request = new HttpPost(UploadURL);
MultipartEntityBuilder mpbuild = MultipartEntityBuilder.create();
mpbuild.addTextBody("category", category);
mpbuild.addTextBody("token", token);
mpbuild.addBinaryBody("file", image);
request.setEntity(mpbuild.build());
HttpEntity response = client.execute(request).getEntity();
return UploadResponse.read(response.getContent());
}
public static CategoryResponse categories() throws IOException {
CloseableHttpClient client = HttpClients.createDefault();
HttpGet request = new HttpGet(CategoryURL);
HttpEntity response = client.execute(request).getEntity();
return CategoryResponse.read(response.getContent());
}
}

View file

@ -0,0 +1,28 @@
package ley.jmclient;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
import javafx.scene.Parent;
import javafx.scene.Scene;
import javafx.scene.image.Image;
import javafx.stage.Stage;
public class Main extends Application {
@Override
public void start(Stage primaryStage) throws Exception{
FXMLLoader loader = new FXMLLoader(getClass().getResource("/main.fxml"));
Parent root = loader.load();
Controller con = loader.getController();
con.setHostServices(getHostServices());
primaryStage.setTitle("JensMemes Upload Client");
primaryStage.setScene(new Scene(root, 700, 275));
primaryStage.getIcons().add(new Image(getClass().getResourceAsStream("/icon.png")));
primaryStage.show();
}
public static void main(String[] args) {
launch(args);
}
}

View file

@ -0,0 +1,18 @@
package ley.jmclient.model;
import com.google.gson.annotations.Expose;
public class Category {
@Expose
public String id;
@Expose
public String name;
@Override
public String toString() {
return name;
}
}

View file

@ -0,0 +1,24 @@
package ley.jmclient.model;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;
public class CategoryResponse {
public static CategoryResponse read(InputStream json) {
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
return gson.fromJson(new InputStreamReader(json), CategoryResponse.class);
}
@Expose
public int status;
@Expose
public List<Category> categories;
}

View file

@ -0,0 +1,27 @@
package ley.jmclient.model;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.annotations.Expose;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.List;
public class UploadResponse {
public static UploadResponse read(InputStream json) {
Gson gson = new GsonBuilder().disableHtmlEscaping().create();
return gson.fromJson(new InputStreamReader(json), UploadResponse.class);
}
@Expose
public int status;
@Expose
public String error;
@Expose
public List<String> files;
}

BIN
src/main/resources/icon.ico Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 50 KiB

BIN
src/main/resources/icon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

View file

@ -0,0 +1,29 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<GridPane alignment="center" hgap="10" vgap="10" xmlns="http://javafx.com/javafx/10.0.2-internal" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ley.jmclient.Controller">
<columnConstraints>
<ColumnConstraints />
</columnConstraints>
<rowConstraints>
<RowConstraints />
</rowConstraints>
<children>
<Pane prefHeight="230.0" prefWidth="556.0">
<children>
<ChoiceBox fx:id="boxCat" layoutX="113.0" layoutY="48.0" prefHeight="25.0" prefWidth="344.0" />
<Label fx:id="lblCat" layoutX="52.0" layoutY="52.0" text="Category:" />
<Label fx:id="lblTok" layoutX="68.0" layoutY="99.0" text="Token:" />
<TextField fx:id="txTok" layoutX="114.0" layoutY="95.0" prefHeight="25.0" prefWidth="344.0" />
<Button fx:id="btnSave" layoutX="469.0" layoutY="95.0" mnemonicParsing="false" onAction="#saveToken" prefHeight="25.0" prefWidth="53.0" text="Save" />
<Button fx:id="btnReload" layoutX="469.0" layoutY="48.0" mnemonicParsing="false" onAction="#reload" text="Reload" />
<Label fx:id="lblFile" layoutX="75.0" layoutY="143.0" text="File:" />
<Button fx:id="btnFile" layoutX="113.0" layoutY="139.0" mnemonicParsing="false" onAction="#chooseFile" text="Choose" />
<Label fx:id="lblSel" layoutX="184.0" layoutY="143.0" prefHeight="17.0" prefWidth="273.0" text="no file selected" />
<Button fx:id="btnUpload" layoutX="468.0" layoutY="139.0" mnemonicParsing="false" onAction="#upload" text="Upload" />
</children>
</Pane>
</children>
</GridPane>