Compare commits

...

48 commits

Author SHA1 Message Date
629fd2a516
Merge branch 'codeowner' into master
Apply codeowner rules after having tested them on github.com

Reviewed-by: Jonas Tobias Hopusch <git@jotoho.de>
2022-07-23 17:28:26 +02:00
35536aa3b2
Mark myself as fallback codeowner for entire repository 2022-07-23 17:27:06 +02:00
428950e45c
Set some formatting settings for features not yet used 2022-03-12 15:54:22 +01:00
ca26a0e652
Some tweaks to the formatting settings 2022-03-12 15:40:06 +01:00
240a3784ed
Introduce and apply IntelliJ IDEA code style settings 2022-03-12 15:24:57 +01:00
5154e8ebfc
Avoid unnecessary string concatenation 2022-03-12 14:36:08 +01:00
653e5295de
Rewrite AppOptions to instead use non-static attributes 2022-03-12 14:20:18 +01:00
a7882ab201
Add missing copyright header to AppOptions.java 2022-03-12 13:59:54 +01:00
e66e3b8483
build: remove devNull variable
This is an imperceptible optimization by reducing the scope of the null stream object
2022-03-12 12:24:54 +01:00
8c6d65f147
Reintroduce shadowJar support using external gradle plugin
Since the project now contains a dependency again (commons-cli), I need to be able to generate
jars with those dependencies packaged. (fat jars)
Partially reverts 28a461b8fc
2022-03-12 12:17:33 +01:00
0aa368d457
Make waiting confirmation message output via logger 2022-03-12 03:51:52 +01:00
99c1bb4d6a
Let IntelliJ format all files 2022-03-12 03:45:06 +01:00
eb64994b5a
Switch to using System.Logger instead of raw outputs 2022-03-12 03:43:03 +01:00
60f20b9549
Add link to project repository to version information 2022-03-12 03:28:21 +01:00
3c40095b1d
Merge branch 'outsource-cli-parsing' into master
Closes https://gitea.jotoho.de/jotoho/waituntil/issues/18
2022-03-12 03:25:41 +01:00
1c48b1861f
Rewrite some error messages for wrong argument amounts 2022-03-12 03:23:28 +01:00
b53e7a617d
Refactor main method to use commons-cli to parse arguments 2022-03-12 03:16:00 +01:00
ddf8047ebd
Disable modularization
The modularization file was heavily interfering with the addition and usage of the commons-cli
dependency which does not have a static module name.

Since the benefits it gave this very small application were miniscule, I have decided to
delete / comment out all relevant configuration
2022-03-12 03:13:30 +01:00
1a25963371
Correct incorrect group for commons-cli dependency 2022-03-12 03:12:58 +01:00
fe50b6b85a
Add commons-cli dependency to gradle project configuration 2022-03-12 01:58:05 +01:00
ae11042442
Merge branch 'update-gradle' into master
Basic maintenance work
2022-02-11 05:24:37 +01:00
f03efe7d79
Upgrade gradle version in properties file to gradle 7.4 2022-02-11 05:20:54 +01:00
af4002a431
Merge branch 'contribution-guidelines' into master 2022-01-28 02:12:38 +01:00
c216f6dcc5
Merge branch 'modify-project-settings' into master 2022-01-28 02:12:22 +01:00
28a461b8fc
Remove fat jar module and use java standard library
Removes usage of org.apache.commons classes and instead relies on functionality of Java itself.
It also removes the now-unnecessary plugin dependency for shadowJars.
2022-01-28 02:06:45 +01:00
6b064eb806
Define gradle version in gradle-wrapper.properties 2022-01-28 01:13:46 +01:00
5f3d176045
Stop excluding gradle directory 2022-01-28 01:10:46 +01:00
5d73c12316
Add instructions on supplying contributor information
This should make adding oneself to AUTHORS.md easier.
2022-01-28 01:04:50 +01:00
f42f289b4e
Add basic AUTHORS.md 2022-01-28 00:58:38 +01:00
bb0ef7631b
Add copyright banner to all java sourcefiles
For the purposes of transparency regarding the FOSS license (AGPLv3+) used by this project,
all source files should contain the standard license header.
2022-01-28 00:31:59 +01:00
0ea62601e5
Update copyright year in README.md 2022-01-28 00:28:16 +01:00
be2f6fdac2
Add contact information for feedback and patch submissions 2022-01-28 00:27:26 +01:00
3566b52698
Merge branch 'modularize' into master
This branch introduces some configuration that enables Java 9 modules in this project,
adds a GPL copyright disclaimer to the output of --version flag
and makes changes to gradle that make the application version dynamically assigned using git
information and the "git describe" command.

Closes #16
2022-01-02 18:34:23 +01:00
d09cd0f37e
Determine application version by calling git describe 2022-01-02 18:33:17 +01:00
fae31308e0
Add java module config to project 2022-01-02 18:32:46 +01:00
427f61e1c2
Merge branch 'fix-version' (#17) into master 2022-01-02 17:15:21 +01:00
7f0709463a
Fix bug with version flag 2022-01-02 17:10:32 +01:00
1a41afc408
Merge branch 'backtojava' into master 2022-01-02 16:54:04 +01:00
88b0acf698
Delete obsolete compile and run scripts 2021-12-01 14:48:27 +01:00
7357b25104
Fix README 2021-12-01 14:46:00 +01:00
d5484460d1
Port waituntil from Kotlin to Java 2021-12-01 14:36:07 +01:00
e31a82f1c5
Merge pull request 'Switch to language version Java 17 LTS' (#13) from java17 into master
Reviewed-on: https://gitea.jotoho.de/jotoho/waituntil/pulls/13
2021-12-01 12:34:24 +01:00
fd3697e3db
Upgrade to Java 17 2021-12-01 12:30:21 +01:00
e11d3ead97
Merge pull request 'Add --version commandline flag and support executable jar files with Gradle' (#12) from version-and-fat-jars into master
Reviewed-on: https://gitea.jotoho.de/jotoho/waituntil/pulls/12
2021-09-19 22:18:13 +02:00
ae13ce049f
Add jar metadata and support generating fat jars 2021-09-19 22:13:22 +02:00
d62bbc5f90
Imports optimization 2021-09-19 22:12:31 +02:00
09cf7a9168
Go back to unclassed functions and use DummyClass instead 2021-09-19 22:12:03 +02:00
d294fe6c09
Ignore .zst archives 2021-09-19 21:17:33 +02:00
19 changed files with 466 additions and 163 deletions

1
.github/CODEOWNERS vendored Normal file
View file

@ -0,0 +1 @@
* @jotoho

9
.gitignore vendored
View file

@ -31,11 +31,12 @@ hs_err_pid*
build
# Ignore gradle wrapper
/gradle
/gradlew
/gradlew.bat
gradlew
gradlew.bat
# Ignore manual compilation results
/de/jotoho/
/META-INF
/.idea
/.idea/*
!/.idea/codeStyles/
*.zst

View file

@ -0,0 +1,84 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="LINE_SEPARATOR" value="&#10;" />
<option name="RIGHT_MARGIN" value="100" />
<option name="WRAP_WHEN_TYPING_REACHES_RIGHT_MARGIN" value="true" />
<option name="ENABLE_SECOND_REFORMAT" value="true" />
<option name="SOFT_MARGINS" value="80" />
<JavaCodeStyleSettings>
<option name="ANNOTATION_PARAMETER_WRAP" value="5" />
<option name="ALIGN_MULTILINE_ANNOTATION_PARAMETERS" value="true" />
<option name="ALIGN_MULTILINE_TEXT_BLOCKS" value="true" />
<option name="JD_ADD_BLANK_AFTER_PARM_COMMENTS" value="true" />
<option name="JD_ADD_BLANK_AFTER_RETURN" value="true" />
<option name="JD_P_AT_EMPTY_LINES" value="false" />
<option name="JD_KEEP_INVALID_TAGS" value="false" />
<option name="JD_KEEP_EMPTY_LINES" value="false" />
<option name="JD_DO_NOT_WRAP_ONE_LINE_COMMENTS" value="true" />
<option name="JD_PARAM_DESCRIPTION_ON_NEW_LINE" value="true" />
</JavaCodeStyleSettings>
<JetCodeStyleSettings>
<option name="CONTINUATION_INDENT_IN_PARAMETER_LISTS" value="false" />
<option name="CONTINUATION_INDENT_IN_ARGUMENT_LISTS" value="false" />
<option name="CONTINUATION_INDENT_FOR_CHAINED_CALLS" value="false" />
<option name="CONTINUATION_INDENT_IN_SUPERTYPE_LISTS" value="false" />
<option name="WRAP_EXPRESSION_BODY_FUNCTIONS" value="1" />
</JetCodeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" />
<option name="KEEP_BLANK_LINES_BETWEEN_PACKAGE_DECLARATION_AND_HEADER" value="0" />
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="0" />
<option name="ALIGN_MULTILINE_CHAINED_METHODS" value="true" />
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_BINARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_ASSIGNMENT" value="true" />
<option name="ALIGN_MULTILINE_TERNARY_OPERATION" value="true" />
<option name="ALIGN_MULTILINE_THROWS_LIST" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="ALIGN_MULTILINE_ARRAY_INITIALIZER_EXPRESSION" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="5" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="RESOURCE_LIST_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="1" />
<option name="THROWS_LIST_WRAP" value="1" />
<option name="EXTENDS_KEYWORD_WRAP" value="1" />
<option name="THROWS_KEYWORD_WRAP" value="1" />
<option name="METHOD_CALL_CHAIN_WRAP" value="2" />
<option name="BINARY_OPERATION_WRAP" value="1" />
<option name="TERNARY_OPERATION_WRAP" value="5" />
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" />
<option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" />
<option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
<option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
<option name="FOR_STATEMENT_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_WRAP" value="5" />
<option name="ARRAY_INITIALIZER_LBRACE_ON_NEXT_LINE" value="true" />
<option name="ARRAY_INITIALIZER_RBRACE_ON_NEXT_LINE" value="true" />
<option name="ASSIGNMENT_WRAP" value="1" />
<option name="WRAP_COMMENTS" value="true" />
<option name="ASSERT_STATEMENT_WRAP" value="1" />
<option name="WRAP_LONG_LINES" value="true" />
<option name="PARAMETER_ANNOTATION_WRAP" value="5" />
<option name="VARIABLE_ANNOTATION_WRAP" value="5" />
<option name="ENUM_CONSTANTS_WRAP" value="5" />
<option name="KEEP_BUILDER_METHODS_INDENTS" value="true" />
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="kotlin">
<option name="ALIGN_MULTILINE_PARAMETERS_IN_CALLS" value="true" />
<option name="ALIGN_MULTILINE_EXTENDS_LIST" value="true" />
<option name="CALL_PARAMETERS_WRAP" value="5" />
<option name="METHOD_PARAMETERS_WRAP" value="5" />
<option name="EXTENDS_LIST_WRAP" value="5" />
<option name="METHOD_CALL_CHAIN_WRAP" value="5" />
<option name="ASSIGNMENT_WRAP" value="5" />
<option name="PARAMETER_ANNOTATION_WRAP" value="5" />
<option name="VARIABLE_ANNOTATION_WRAP" value="5" />
<option name="ENUM_CONSTANTS_WRAP" value="5" />
</codeStyleSettings>
</code_scheme>
</component>

View file

@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>

16
AUTHORS.md Normal file
View file

@ -0,0 +1,16 @@
# waituntil Contributors / Authors
By adding their names to this document, contributors agree to license all of their
contributions and patches to the waituntil project [under the AGPL version 3 or later.](./LICENSE.md)
Contributors may choose to supply either their complete legal name, online pseudonym or both.
At least one is required.
The email, website and notes fields are optional but contributors are encouraged
to supply at least one reliable method of communication.
## Maintainer(s)
| full name | pseudonym | email | website | notes |
|-|:-:|-:|-:|-|
| Jonas Tobias Hopusch | jotoho | [contact@jotoho.de](mailto:contact@jotoho.de) | [www.jotoho.de](https://www.jotoho.de/) | original creator |

View file

@ -1,12 +1,38 @@
# waituntil
This simple tool doubles as a programming exercise for me, as I attempt to learn Kotlin from my perspective as a Java developer and a (hopefully) useful tool for personal use. I will expand this README with details as the project evolves.
A basic tool for delaying work in the terminal to a specific time. This software was originally
written in Kotlin and then recently ported to Java.
Usage:
```sh
java -jar ./waituntil.jar 10:30 ; reboot # Replace reboot with your command
```
The example above would make the program wait until half past ten AM before exiting and allowing
the next command to run. The timestamp can be passed in the formats `HH:MM` or `HH:MM:SS` and must
be in the 24-hour system. Passing dates is not supported but entering a time that has already passed
will make the software wait until that time on the following day.
## Contributing / Submitting Feedback
The [canonical home of this project](https://gitea.jotoho.de/jotoho/waituntil/) is
[on my personal Gitea-instance](https://gitea.jotoho.de/) but since it has registration
turned off, collaborating there is difficult.
If you have not been given an account on [gitea.jotoho.de](https://gitea.jotoho.de/)
then you can alternatively send me feedback, bug reports or patches [via email to
contact@jotoho.de](mailto:contact@jotoho.de).
Should that fail, there may be alternative ways to contact me listed on
[my personal website.](https://www.jotoho.de/)
In the future, I may also decide to create a mirror for this project on GitHub, gitlab.com or similar.
## Copyright / Licensing
```
waituntil - a tool for delaying command execution until the specified time
Copyright (C) 2021 Jonas Tobias Hopusch
Copyright (C) 2022 Jonas Tobias Hopusch
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as

View file

@ -1,15 +1,13 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.io.ByteArrayOutputStream
import java.io.OutputStream
plugins {
// Apply the org.jetbrains.kotlin.jvm Plugin to add support for Kotlin.
kotlin("jvm") version "latest.release"
// Apply the application plugin to add support for building a CLI application in Java.
application
}
java
group = "de.jotoho"
version = "0.1.1"
id("com.github.johnrengelman.shadow") version "7.1.2"
}
repositories {
// Use Maven Central for resolving dependencies.
@ -17,33 +15,39 @@ repositories {
}
dependencies {
// Align versions of all Kotlin components
implementation(platform(kotlin("bom", "latest.release")))
// Use the Kotlin standard library.
implementation(kotlin("stdlib", "latest.release"))
// Use the Kotlin test library.
testImplementation(kotlin("test", "latest.release"))
// Use the Kotlin JUnit integration.
testImplementation(kotlin("test-junit", "latest.release"))
implementation(group = "commons-cli", name = "commons-cli", version = "1.5.0")
}
fun versionBanner(): String {
val os = ByteArrayOutputStream()
project.exec {
commandLine = "git describe --tags --always --dirty --abbrev".split(" ")
standardOutput = os
errorOutput = OutputStream.nullOutputStream()
}
return String(os.toByteArray()).trim()
}
group = "de.jotoho"
version = versionBanner()
java {
sourceCompatibility = JavaVersion.VERSION_16
targetCompatibility = JavaVersion.VERSION_16
sourceCompatibility = JavaVersion.VERSION_17
targetCompatibility = JavaVersion.VERSION_17
}
tasks.test {
useJUnitPlatform()
}
tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "16"
tasks.jar {
manifest {
attributes("Implementation-Title" to project.name,
"Implementation-Version" to project.version,
"Main-Class" to "de.jotoho.waituntil.Main"
//"Main-Module" to "de.jotoho.waituntil.main"
)
}
}
application {
// Define the main class for the application.
mainClass.set("de.jotoho.waituntil.StartKt")
mainClass.set("de.jotoho.waituntil.Main")
//mainModule.set("de.jotoho.waituntil.main")
}

View file

@ -1,5 +0,0 @@
#!/bin/sh
# shellcheck disable=SC2046
# Word splitting in find results is intentional!
kotlinc $(find src/main -type f -iname '*.kt') -jvm-target 16 -include-runtime -d waituntil.jar

View file

@ -1,2 +1 @@
org.gradle.daemon=false
kotlin.code.style=official

View file

@ -0,0 +1 @@
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip

3
run.sh
View file

@ -1,3 +0,0 @@
#!/bin/sh
java -jar waituntil.jar $*

View file

@ -0,0 +1,39 @@
package de.jotoho.waituntil;
/*
waituntil - a tool for delaying command execution until the specified time
Copyright (C) 2022 Jonas Tobias Hopusch
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
final class AppOptions {
public final Option help = Option.builder()
.argName("h")
.longOpt("help")
.desc("Shows this help message and exits")
.build();
public final Option version = Option.builder()
.argName("v")
.longOpt("version")
.desc("Shows version information and exits")
.build();
public final Options options = new Options().addOption(help)
.addOption(version);
}

View file

@ -0,0 +1,30 @@
package de.jotoho.waituntil;
/*
waituntil - a tool for delaying command execution until the specified time
Copyright (C) 2022 Jonas Tobias Hopusch
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import java.util.Locale;
public record GlobalConf() {
public static final String langGerman = "de";
public static final String applicationOutputLanguage = (Locale.getDefault()
.getLanguage()
.equals(Locale.GERMAN.getLanguage()))
? Locale.GERMAN.getLanguage()
: Locale.ENGLISH.getLanguage();
}

View file

@ -0,0 +1,115 @@
package de.jotoho.waituntil;
/*
waituntil - a tool for delaying command execution until the specified time
Copyright (C) 2022 Jonas Tobias Hopusch
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import static de.jotoho.waituntil.GlobalConf.applicationOutputLanguage;
import static java.lang.System.Logger.Level;
// This file contains the main function and other utility function necessary
// for interpreting the terminal arguments.
// See README.md and LICENSE.md for license information
// Author: Jonas Tobias Hopusch (@jotoho)
public final class Main {
private static final System.Logger logger = System.getLogger("main");
private static void printVersionInformation() {
final var thisPackage = Main.class.getPackage();
final var appVersion = thisPackage.getImplementationVersion() != null
? thisPackage.getImplementationVersion()
: "version unknown";
System.out.println("waituntil " + appVersion);
System.out.println("""
Project Repository: https://gitea.jotoho.de/jotoho/waituntil
This program is free software: you can redistribute it and/or modify it under the terms of the
GNU General Public License as published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.""");
}
private static void printHelpInformation() {
switch (applicationOutputLanguage) {
case GlobalConf.langGerman -> logger.log(Level.ERROR,
"Hilfe kommt noch. (Nicht " +
"implementiert)");
default -> logger.log(Level.ERROR, "Help is yet to come. (Not implemented)");
}
}
private static CommandLine parseArgs(final Options options, final String[] args)
throws ParseException {
return DefaultParser.builder()
.setStripLeadingAndTrailingQuotes(true)
.build()
.parse(options, args);
}
public synchronized static void main(final String[] args) {
// Retrieve defined CLI options
final var appOptions = new AppOptions();
try {
// Parse CLI
final var parsedArguments = parseArgs(appOptions.options, args);
final var userData = parsedArguments.getArgs();
// Differentiate between usage scenarios
if (parsedArguments.hasOption(appOptions.help)) {
printHelpInformation();
} else if (parsedArguments.hasOption(appOptions.version)) {
printVersionInformation();
} else if (userData.length == 0) {
switch (applicationOutputLanguage) {
case GlobalConf.langGerman -> logger.log(Level.ERROR,
"Es wurde keine Uhrzeit " +
"angegeben.");
default -> logger.log(Level.ERROR, "No target time was provided.");
}
System.exit(1);
} else if (userData.length > 1) {
switch (applicationOutputLanguage) {
case GlobalConf.langGerman -> logger.log(Level.ERROR,
"Zu viele Argumente " +
"wurden angegeben.");
default -> logger.log(Level.ERROR, "Too many arguments provided.");
}
System.exit(1);
} else {
final var target = TimeCalculator.calculateAndAnnounceTargetTime(userData[0]);
Sleep.waitUntilTimeStamp(target);
}
} catch (final ParseException e) {
System.getLogger("main")
.log(Level.ERROR,
"Parsing of arguments failed and the program cannot continue.",
e);
System.exit(1);
}
}
}

View file

@ -0,0 +1,53 @@
package de.jotoho.waituntil;
/*
waituntil - a tool for delaying command execution until the specified time
Copyright (C) 2022 Jonas Tobias Hopusch
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import java.time.Instant;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.time.temporal.ChronoUnit;
import java.util.TimeZone;
import static java.lang.System.Logger.Level;
public final class Sleep {
public static void waitUntilTimeStamp(ZonedDateTime timestamp) {
try {
Thread.sleep(Math.max(0,
Instant.now()
.until(timestamp, ChronoUnit.MILLIS)));
} catch (final InterruptedException ignored) {
}
final String formattedTimeStamp = DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
.withZone(TimeZone.getDefault()
.toZoneId())
.format(Instant.now());
final String msg = switch (GlobalConf.applicationOutputLanguage) {
case GlobalConf.langGerman -> "Erfolgreich bis %s gewartet!";
default -> "Successfully waited until %s";
};
final String msgWithData = msg.formatted(formattedTimeStamp);
System.getLogger("sleep")
.log(Level.INFO, msgWithData);
}
}

View file

@ -0,0 +1,58 @@
package de.jotoho.waituntil;
/*
waituntil - a tool for delaying command execution until the specified time
Copyright (C) 2022 Jonas Tobias Hopusch
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU Affero General Public License as
published by the Free Software Foundation, either version 3 of the
License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Affero General Public License for more details.
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import java.time.Instant;
import java.time.LocalDate;
import java.time.LocalTime;
import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.FormatStyle;
import java.util.TimeZone;
import static java.lang.System.Logger.Level;
public final class TimeCalculator {
public static ZonedDateTime calculateAndAnnounceTargetTime(final String userTimeInputRaw) {
final var userTimeInputRelative = LocalTime.parse(userTimeInputRaw);
final var userTimeInputAbsolute = ZonedDateTime.of(LocalDate.now(),
userTimeInputRelative,
TimeZone.getDefault()
.toZoneId());
final var userTimeInputFinal = (Instant.now()
.isBefore(userTimeInputAbsolute.toInstant()))
? userTimeInputAbsolute
: userTimeInputAbsolute.plusDays(1);
final var formattedTimeStamp =
userTimeInputFinal.format(DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG));
final String msg = switch (GlobalConf.applicationOutputLanguage) {
case GlobalConf.langGerman -> ("Dieses Program wird bis zum %s warten.").formatted(
formattedTimeStamp);
default -> "WaitUntil will suspend until %s".formatted(formattedTimeStamp);
};
System.getLogger("timecalculator")
.log(Level.INFO, msg);
return userTimeInputFinal;
}
}

View file

@ -1,24 +0,0 @@
package de.jotoho.waituntil
import java.time.Instant
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.time.format.FormatStyle
import java.time.temporal.ChronoUnit
import java.util.*
fun waitUntilTimeStamp(timestamp: ZonedDateTime) {
Thread.sleep(Instant.now().until(timestamp, ChronoUnit.MILLIS).coerceAtLeast(0))
val formattedTimeStamp: String =
DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
.withZone(TimeZone.getDefault().toZoneId())
.format(Instant.now())
when (applicationOutputLanguage) {
langGerman -> System.err.println("Erfolgreich bis $formattedTimeStamp gewartet!")
else -> {
System.err.println("Successfully waited until $formattedTimeStamp")
}
}
}

View file

@ -1,56 +0,0 @@
package de.jotoho.waituntil
import java.util.*
import kotlin.system.exitProcess
// This file contains the main function and other utility function necessary for interpreting the terminal arguments.
// See README.md and LICENSE.md for license information
// Author: Jonas Tobias Hopusch (@jotoho)
val langGerman: String = Locale.GERMAN.language
val applicationOutputLanguage: String = if (Locale.getDefault().language.equals(Locale.GERMAN.language))
Locale.GERMAN.language
else Locale.ENGLISH.language
fun main(args: Array<String>) {
val optionDictionary = mapOf(Pair("-h", "--help"))
val options = HashSet<String>()
val words = HashSet<String>()
for (arg in args) {
if (arg.startsWith("--")) {
options.add(arg.substring(startIndex=2))
}
else if (arg.startsWith('-')) {
if (optionDictionary.containsKey(arg))
options.add(optionDictionary[arg]!!.substring(startIndex=2))
else
System.err.println("Short-hand '$arg' does not exist. Ignoring!")
}
else
words.add(arg)
}
if (options.contains("help")) {
when (applicationOutputLanguage) {
langGerman -> println("Hilfe kommt noch. (Nicht implementiert)")
else -> {
println("Help is yet to come. (Not implemented)")
}
}
}
else if (words.size == 1) {
val target = calculateAndAnnounceTargetTime(words.iterator().next())
waitUntilTimeStamp(target)
}
else {
when (applicationOutputLanguage) {
langGerman -> System.err.println("FATAL: Es wurde exact ein nicht-flag Argument erwartet. (${words.size} erhalten)")
else -> {
System.err.println("FATAL: Expected one non-flag argument. (Got ${words.size})")
}
}
exitProcess(1)
}
}

View file

@ -1,41 +0,0 @@
package de.jotoho.waituntil
import java.time.Instant
import java.time.LocalDate
import java.time.LocalTime
import java.time.ZonedDateTime
import java.time.format.DateTimeFormatter
import java.time.format.FormatStyle
import java.util.TimeZone
fun calculateAndAnnounceTargetTime(userTimeInputRaw: String): ZonedDateTime {
val userTimeInputRelative = LocalTime.parse(userTimeInputRaw)
val userTimeInputAbsolute =
ZonedDateTime.of(
LocalDate.now(),
userTimeInputRelative,
TimeZone.getDefault().toZoneId()
)
val userTimeInputFinal =
if (Instant.now().isBefore(userTimeInputAbsolute.toInstant()))
userTimeInputAbsolute
else userTimeInputAbsolute.plusDays(1)
val formattedTimeStamp =
userTimeInputFinal.format(
DateTimeFormatter.ofLocalizedDateTime(FormatStyle.LONG)
)
when (applicationOutputLanguage) {
langGerman ->
System.err.println(
"Dieses Program wird bis zum $formattedTimeStamp warten."
)
else -> {
println("WaitUntil will suspend until $formattedTimeStamp")
}
}
return userTimeInputFinal
}