Initial commit
This commit is contained in:
commit
9f53052954
10 changed files with 755 additions and 0 deletions
36
.gitignore
vendored
Normal file
36
.gitignore
vendored
Normal file
|
@ -0,0 +1,36 @@
|
|||
# IntelliJ
|
||||
.idea
|
||||
.idea/*
|
||||
*.iml
|
||||
.idea/workspace.xml
|
||||
|
||||
# Mac OS X
|
||||
.DS_Store
|
||||
|
||||
.classpath
|
||||
.project
|
||||
.settings
|
||||
.gradle
|
||||
gradle.properties
|
||||
|
||||
build/
|
||||
core/build/
|
||||
debug/build/
|
||||
experimental/build/
|
||||
extensions/build/
|
||||
gradle/wrapper/gradle-wrapper.properties
|
||||
|
||||
store/
|
||||
|
||||
bin/
|
||||
core/bin
|
||||
debug/bin
|
||||
experimental/bin
|
||||
extensions/bin
|
||||
|
||||
target/
|
||||
.metadata
|
||||
|
||||
clocc.ipr
|
||||
clocc.iws
|
||||
|
38
build.gradle
Normal file
38
build.gradle
Normal file
|
@ -0,0 +1,38 @@
|
|||
group 'de.vanitasvitae.xmpp_sync'
|
||||
version '1.0-SNAPSHOT'
|
||||
|
||||
apply plugin: 'java'
|
||||
apply plugin: 'idea'
|
||||
|
||||
sourceCompatibility = 1.8
|
||||
|
||||
repositories {
|
||||
mavenLocal()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
ext {
|
||||
smackVersion="4.3.0-alpha1-SNAPSHOT"
|
||||
}
|
||||
|
||||
dependencies {
|
||||
testCompile group: 'junit', name: 'junit', version: '4.12'
|
||||
compile "org.igniterealtime.smack:smack-java7:$smackVersion"
|
||||
compile "org.igniterealtime.smack:smack-omemo-signal:$smackVersion"
|
||||
compile "org.igniterealtime.smack:smack-resolver-dnsjava:$smackVersion"
|
||||
compile "org.igniterealtime.smack:smack-tcp:$smackVersion"
|
||||
compile 'commons-cli:commons-cli:1.4'
|
||||
}
|
||||
|
||||
jar {
|
||||
from(configurations.compile.collect { it.isDirectory() ? it : zipTree(it) }) {
|
||||
exclude "META-INF/*.SF"
|
||||
exclude "META-INF/LICENSE"
|
||||
}
|
||||
manifest {
|
||||
attributes(
|
||||
'Main-Class': 'de.vanitasvitae.sync_client.Main'
|
||||
)
|
||||
}
|
||||
}
|
||||
|
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Normal file
Binary file not shown.
172
gradlew
vendored
Executable file
172
gradlew
vendored
Executable file
|
@ -0,0 +1,172 @@
|
|||
#!/usr/bin/env sh
|
||||
|
||||
##############################################################################
|
||||
##
|
||||
## Gradle start up script for UN*X
|
||||
##
|
||||
##############################################################################
|
||||
|
||||
# Attempt to set APP_HOME
|
||||
# Resolve links: $0 may be a link
|
||||
PRG="$0"
|
||||
# Need this for relative symlinks.
|
||||
while [ -h "$PRG" ] ; do
|
||||
ls=`ls -ld "$PRG"`
|
||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
||||
if expr "$link" : '/.*' > /dev/null; then
|
||||
PRG="$link"
|
||||
else
|
||||
PRG=`dirname "$PRG"`"/$link"
|
||||
fi
|
||||
done
|
||||
SAVED="`pwd`"
|
||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
||||
APP_HOME="`pwd -P`"
|
||||
cd "$SAVED" >/dev/null
|
||||
|
||||
APP_NAME="Gradle"
|
||||
APP_BASE_NAME=`basename "$0"`
|
||||
|
||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
DEFAULT_JVM_OPTS=""
|
||||
|
||||
# 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" "$@"
|
84
gradlew.bat
vendored
Normal file
84
gradlew.bat
vendored
Normal file
|
@ -0,0 +1,84 @@
|
|||
@if "%DEBUG%" == "" @echo off
|
||||
@rem ##########################################################################
|
||||
@rem
|
||||
@rem Gradle startup script for Windows
|
||||
@rem
|
||||
@rem ##########################################################################
|
||||
|
||||
@rem Set local scope for the variables with windows NT shell
|
||||
if "%OS%"=="Windows_NT" setlocal
|
||||
|
||||
set DIRNAME=%~dp0
|
||||
if "%DIRNAME%" == "" set DIRNAME=.
|
||||
set APP_BASE_NAME=%~n0
|
||||
set APP_HOME=%DIRNAME%
|
||||
|
||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||
set DEFAULT_JVM_OPTS=
|
||||
|
||||
@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
2
settings.gradle
Normal file
|
@ -0,0 +1,2 @@
|
|||
rootProject.name = 'client'
|
||||
|
49
src/main/java/de/vanitasvitae/sync_client/Client.java
Normal file
49
src/main/java/de/vanitasvitae/sync_client/Client.java
Normal file
|
@ -0,0 +1,49 @@
|
|||
package de.vanitasvitae.sync_client;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.util.HashSet;
|
||||
import java.util.Set;
|
||||
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.XMPPConnection;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.roster.Roster;
|
||||
import org.jivesoftware.smack.roster.SubscribeListener;
|
||||
import org.jivesoftware.smack.tcp.XMPPTCPConnection;
|
||||
import org.jivesoftware.smackx.jingle.transport.jingle_ibb.JingleIBBTransport;
|
||||
import org.jivesoftware.smackx.jingle.transport.jingle_ibb.JingleIBBTransportManager;
|
||||
import org.jivesoftware.smackx.jingle.transport.jingle_s5b.JingleS5BTransportManager;
|
||||
|
||||
import org.jxmpp.jid.FullJid;
|
||||
import org.jxmpp.stringprep.XmppStringprepException;
|
||||
|
||||
public class Client {
|
||||
|
||||
protected final XMPPConnection connection;
|
||||
protected final Path root;
|
||||
protected final Set<FullJid> remotes = new HashSet<>();
|
||||
|
||||
public Client(String username, String password, String directory) throws XmppStringprepException {
|
||||
File dir = new File(directory);
|
||||
if (!dir.exists()) {
|
||||
throw new IllegalArgumentException("Directory " + directory + " does not exist!");
|
||||
}
|
||||
|
||||
root = Paths.get(directory);
|
||||
connection = new XMPPTCPConnection(username, password);
|
||||
Roster.getInstanceFor(connection).addSubscribeListener((from, subscribeRequest) -> SubscribeListener.SubscribeAnswer.Approve);
|
||||
JingleS5BTransportManager.getInstanceFor(connection);
|
||||
JingleIBBTransportManager.getInstanceFor(connection);
|
||||
}
|
||||
|
||||
public void login() throws InterruptedException, IOException, SmackException, XMPPException {
|
||||
((XMPPTCPConnection) connection).connect().login();
|
||||
}
|
||||
|
||||
public void addRemote(FullJid remote) {
|
||||
remotes.add(remote);
|
||||
}
|
||||
}
|
161
src/main/java/de/vanitasvitae/sync_client/Main.java
Normal file
161
src/main/java/de/vanitasvitae/sync_client/Main.java
Normal file
|
@ -0,0 +1,161 @@
|
|||
package de.vanitasvitae.sync_client;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.util.List;
|
||||
import java.util.Scanner;
|
||||
|
||||
import org.jivesoftware.smack.AbstractXMPPConnection;
|
||||
import org.jivesoftware.smack.SmackConfiguration;
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.packet.Presence;
|
||||
import org.jivesoftware.smack.roster.Roster;
|
||||
import org.jivesoftware.smack.roster.RosterEntry;
|
||||
|
||||
import org.apache.commons.cli.CommandLine;
|
||||
import org.apache.commons.cli.CommandLineParser;
|
||||
import org.apache.commons.cli.DefaultParser;
|
||||
import org.apache.commons.cli.HelpFormatter;
|
||||
import org.apache.commons.cli.Option;
|
||||
import org.apache.commons.cli.Options;
|
||||
import org.apache.commons.cli.ParseException;
|
||||
import org.jxmpp.jid.BareJid;
|
||||
import org.jxmpp.jid.FullJid;
|
||||
import org.jxmpp.jid.impl.JidCreate;
|
||||
import org.jxmpp.stringprep.XmppStringprepException;
|
||||
|
||||
public class Main {
|
||||
|
||||
private static Options prepareOptions() {
|
||||
Options options = new Options();
|
||||
Option username = Option.builder("u").longOpt("username").required().argName("user@server.tld").hasArg().desc("Barejid of the XMPP account").build();
|
||||
Option password = Option.builder("p").longOpt("password").required().argName("swordfish").hasArg().desc("Password of the XMPP account").build();
|
||||
Option debug = Option.builder("d").longOpt("debug").desc("Start in debug mode").build();
|
||||
Option directory = Option.builder("D").longOpt("directory").hasArg().required().desc("Directory to sync").build();
|
||||
Option master = Option.builder("m").longOpt("master").desc("Start in master mode").build();
|
||||
options.addOption(username);
|
||||
options.addOption(password);
|
||||
options.addOption(debug);
|
||||
options.addOption(directory);
|
||||
options.addOption(master);
|
||||
return options;
|
||||
}
|
||||
|
||||
public static Slave slave(String username, String password, String dir) throws IOException, InterruptedException, XMPPException, SmackException {
|
||||
return new Slave(username, password, dir);
|
||||
}
|
||||
|
||||
public static Master master(String username, String password, String dir) throws IOException, InterruptedException, XMPPException, SmackException {
|
||||
return new Master(username, password, dir);
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
|
||||
Options options = prepareOptions();
|
||||
HelpFormatter formatter = new HelpFormatter();
|
||||
CommandLineParser parser = new DefaultParser();
|
||||
|
||||
CommandLine cmd = null;
|
||||
try {
|
||||
cmd = parser.parse(options, args);
|
||||
} catch (ParseException e) {
|
||||
formatter.printHelp("client", options, true);
|
||||
return;
|
||||
}
|
||||
|
||||
String username = cmd.getOptionValue('u');
|
||||
String password = cmd.getOptionValue('p');
|
||||
String dir = cmd.getOptionValue('D');
|
||||
|
||||
if (cmd.hasOption('d')) {
|
||||
SmackConfiguration.DEBUG = true;
|
||||
}
|
||||
|
||||
Client client;
|
||||
if (cmd.hasOption('m')) {
|
||||
client = master(username, password, dir);
|
||||
} else {
|
||||
client = slave(username, password, dir);
|
||||
}
|
||||
|
||||
client.login();
|
||||
System.out.println("Ready!");
|
||||
|
||||
Scanner scanner = new Scanner(System.in);
|
||||
|
||||
outerloop: while (true) {
|
||||
String line = scanner.nextLine();
|
||||
if (line == null || line.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
String[] split = line.split(" ");
|
||||
if (split.length == 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
Roster roster = Roster.getInstanceFor(client.connection);
|
||||
|
||||
switch (split[0]) {
|
||||
case "/add":
|
||||
if (split.length != 2) {
|
||||
System.out.println("Usage: /add user@server.tld");
|
||||
for (RosterEntry r : roster.getEntries()) {
|
||||
System.out.println(r.getJid());
|
||||
}
|
||||
continue outerloop;
|
||||
}
|
||||
try {
|
||||
BareJid bareJid = getJid(split[1]);
|
||||
roster.createEntry(getJid(split[1]), bareJid.getLocalpartOrNull().toString(), null);
|
||||
} catch (XmppStringprepException e) {
|
||||
System.out.println("Illegal BareJid.");
|
||||
}
|
||||
break;
|
||||
|
||||
case "/sync":
|
||||
if (split.length != 2) {
|
||||
System.out.println("Usage: /sync user@server.tld");
|
||||
for (FullJid fullJid : client.remotes) {
|
||||
System.out.println(fullJid.toString());
|
||||
}
|
||||
continue outerloop;
|
||||
}
|
||||
|
||||
List<Presence> presences = roster.getPresences(getJid(split[1]));
|
||||
|
||||
if (presences.size() == 0) {
|
||||
System.out.println("No device online!");
|
||||
continue outerloop;
|
||||
} else if (presences.size() == 1) {
|
||||
client.addRemote(presences.get(0).getFrom().asFullJidOrThrow());
|
||||
} else {
|
||||
while (true) {
|
||||
System.out.println("Please select a resource:");
|
||||
for (int i = 0; i < presences.size(); i++) {
|
||||
System.out.println(i + " " + presences.get(i).getFrom().asFullJidOrThrow().toString());
|
||||
}
|
||||
int selection = Integer.parseInt(scanner.nextLine());
|
||||
if (selection < 0 || selection >= presences.size()) {
|
||||
System.out.println("Invalid selection.");
|
||||
continue;
|
||||
}
|
||||
client.addRemote(presences.get(selection).getFrom().asFullJidOrThrow());
|
||||
continue outerloop;
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case "/quit":
|
||||
((AbstractXMPPConnection) client.connection).disconnect(new Presence(Presence.Type.unavailable, "Shutdown", 100, Presence.Mode.away));
|
||||
break outerloop;
|
||||
}
|
||||
}
|
||||
scanner.close();
|
||||
System.exit(0);
|
||||
}
|
||||
|
||||
public static BareJid getJid(String string) throws XmppStringprepException {
|
||||
return JidCreate.bareFrom(string);
|
||||
}
|
||||
}
|
187
src/main/java/de/vanitasvitae/sync_client/Master.java
Normal file
187
src/main/java/de/vanitasvitae/sync_client/Master.java
Normal file
|
@ -0,0 +1,187 @@
|
|||
package de.vanitasvitae.sync_client;
|
||||
|
||||
import static java.nio.file.LinkOption.NOFOLLOW_LINKS;
|
||||
import static java.nio.file.StandardWatchEventKinds.ENTRY_CREATE;
|
||||
import static java.nio.file.StandardWatchEventKinds.ENTRY_DELETE;
|
||||
import static java.nio.file.StandardWatchEventKinds.ENTRY_MODIFY;
|
||||
import static java.nio.file.StandardWatchEventKinds.OVERFLOW;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.FileSystems;
|
||||
import java.nio.file.FileVisitResult;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.SimpleFileVisitor;
|
||||
import java.nio.file.WatchEvent;
|
||||
import java.nio.file.WatchKey;
|
||||
import java.nio.file.WatchService;
|
||||
import java.nio.file.attribute.BasicFileAttributes;
|
||||
import java.util.HashMap;
|
||||
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smack.util.Async;
|
||||
import org.jivesoftware.smackx.jft.JingleFileTransferManager;
|
||||
|
||||
import org.jxmpp.jid.FullJid;
|
||||
|
||||
public class Master extends Client {
|
||||
|
||||
private final WatchService fileWatcher;
|
||||
private final HashMap<WatchKey, Path> fileKeys;
|
||||
private boolean trace;
|
||||
private JingleFileTransferManager jftm;
|
||||
|
||||
public Master(String username, String password, String directory) throws IOException, InterruptedException, SmackException, XMPPException {
|
||||
super(username, password, directory);
|
||||
fileWatcher = FileSystems.getDefault().newWatchService();
|
||||
fileKeys = new HashMap<>();
|
||||
registerFileWatcher();
|
||||
jftm = JingleFileTransferManager.getInstanceFor(connection);
|
||||
jftm.addIncomingFileOfferListener(offer -> {
|
||||
try {
|
||||
offer.accept(connection, new File(root.toFile(), offer.getFile().getName()));
|
||||
} catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NoResponseException | SmackException.NotConnectedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private void registerFileWatcher() throws IOException {
|
||||
Files.walkFileTree(root, new SimpleFileVisitor<Path>() {
|
||||
@Override
|
||||
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
|
||||
throws IOException
|
||||
{
|
||||
WatchKey key = dir.register(fileWatcher, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
|
||||
if (trace) {
|
||||
Path prev = fileKeys.get(key);
|
||||
if (prev == null) {
|
||||
System.out.format("register: %s\n", dir);
|
||||
} else {
|
||||
if (!dir.equals(prev)) {
|
||||
System.out.format("update: %s -> %s\n", prev, dir);
|
||||
}
|
||||
}
|
||||
}
|
||||
fileKeys.put(key, dir);
|
||||
return FileVisitResult.CONTINUE;
|
||||
}
|
||||
});
|
||||
|
||||
trace = true;
|
||||
|
||||
Async.go(() -> {
|
||||
try {
|
||||
processEvents();
|
||||
} catch (InterruptedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException | SmackException.FeatureNotSupportedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
void processEvents() throws InterruptedException, SmackException.FeatureNotSupportedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException {
|
||||
for (;;) {
|
||||
|
||||
// wait for key to be signalled
|
||||
WatchKey key;
|
||||
try {
|
||||
key = fileWatcher.take();
|
||||
} catch (InterruptedException x) {
|
||||
return;
|
||||
}
|
||||
|
||||
Path dir = fileKeys.get(key);
|
||||
if (dir == null) {
|
||||
System.err.println("WatchKey not recognized!!");
|
||||
continue;
|
||||
}
|
||||
|
||||
for (WatchEvent<?> event: key.pollEvents()) {
|
||||
WatchEvent.Kind kind = event.kind();
|
||||
|
||||
// TBD - provide example of how OVERFLOW event is handled
|
||||
if (kind == OVERFLOW) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// Context for directory entry event is the file name of entry
|
||||
WatchEvent<Path> ev = (WatchEvent<Path>) event;
|
||||
Path name = ev.context();
|
||||
Path child = dir.resolve(name);
|
||||
|
||||
// print out event
|
||||
System.out.format("%s: %s\n", event.kind().name(), child);
|
||||
|
||||
// if directory is created, and watching recursively, then
|
||||
// register it and its sub-directories
|
||||
if (kind == ENTRY_CREATE) {
|
||||
try {
|
||||
if (Files.isDirectory(child, NOFOLLOW_LINKS)) {
|
||||
Files.walkFileTree(child, new SimpleFileVisitor<Path>() {
|
||||
@Override
|
||||
public FileVisitResult preVisitDirectory(Path dir, BasicFileAttributes attrs)
|
||||
throws IOException
|
||||
{
|
||||
WatchKey key = dir.register(fileWatcher, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY);
|
||||
if (trace) {
|
||||
Path prev = fileKeys.get(key);
|
||||
if (prev == null) {
|
||||
System.out.format("register: %s\n", dir);
|
||||
} else {
|
||||
if (!dir.equals(prev)) {
|
||||
System.out.format("update: %s -> %s\n", prev, dir);
|
||||
}
|
||||
}
|
||||
File[] files = dir.toFile().listFiles();
|
||||
for (File f : files) {
|
||||
if (f.isFile()) {
|
||||
try {
|
||||
sendFile(f);
|
||||
} catch (InterruptedException | SmackException.FeatureNotSupportedException | SmackException.NoResponseException | SmackException.NotConnectedException | XMPPException.XMPPErrorException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
fileKeys.put(key, dir);
|
||||
return FileVisitResult.CONTINUE;
|
||||
}
|
||||
});
|
||||
} else if (child.toFile().isFile()) {
|
||||
sendFile(child.toFile());
|
||||
}
|
||||
} catch (IOException x) {
|
||||
}
|
||||
} else if (kind == ENTRY_MODIFY && child.toFile().isFile()) {
|
||||
sendFile(child.toFile());
|
||||
}
|
||||
}
|
||||
|
||||
// reset key and remove from set if directory no longer accessible
|
||||
boolean valid = key.reset();
|
||||
if (!valid) {
|
||||
fileKeys.remove(key);
|
||||
|
||||
// all directories are inaccessible
|
||||
if (fileKeys.isEmpty()) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void sendFile(File file) throws InterruptedException, SmackException.FeatureNotSupportedException, XMPPException.XMPPErrorException, SmackException.NotConnectedException, SmackException.NoResponseException {
|
||||
String fileName = file.getAbsolutePath();
|
||||
String rootPath = root.toAbsolutePath().toString();
|
||||
if (fileName.startsWith(rootPath)) {
|
||||
fileName = fileName.substring(rootPath.length());
|
||||
} else {
|
||||
throw new AssertionError("Illegal path! " + fileName);
|
||||
}
|
||||
for (FullJid recipient : remotes) {
|
||||
jftm.sendFile(file, fileName, recipient);
|
||||
}
|
||||
}
|
||||
}
|
26
src/main/java/de/vanitasvitae/sync_client/Slave.java
Normal file
26
src/main/java/de/vanitasvitae/sync_client/Slave.java
Normal file
|
@ -0,0 +1,26 @@
|
|||
package de.vanitasvitae.sync_client;
|
||||
|
||||
import java.io.File;
|
||||
|
||||
import org.jivesoftware.smack.SmackException;
|
||||
import org.jivesoftware.smack.XMPPException;
|
||||
import org.jivesoftware.smackx.jft.JingleFileTransferManager;
|
||||
|
||||
import org.jxmpp.stringprep.XmppStringprepException;
|
||||
|
||||
public class Slave extends Client {
|
||||
|
||||
public Slave(String username, String password, String dir) throws XmppStringprepException {
|
||||
super(username, password, dir);
|
||||
JingleFileTransferManager jingleFileTransferManager = JingleFileTransferManager.getInstanceFor(connection);
|
||||
jingleFileTransferManager.addIncomingFileOfferListener(offer -> {
|
||||
try {
|
||||
File target = new File(root.toFile(), offer.getFile().getName());
|
||||
target.getParentFile().mkdirs();
|
||||
offer.accept(connection, target);
|
||||
} catch (InterruptedException | XMPPException.XMPPErrorException | SmackException.NoResponseException | SmackException.NotConnectedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
Loading…
Reference in a new issue