ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

runelite-client: split ostype into its own utility

Browse Source
This commit is contained in:
arlyon
2018-02-28 17:38:55 -05:00
committed by Adam
parent 79e53bb3eb
commit 7601f984c4
2 changed files with 69 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
runelite-client/src/main/java/net/runelite/client/Notifier.java
View File

@@ -33,49 +33,22 @@ import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import net.runelite.client.config.RuneLiteConfig;
import net.runelite.client.util.OSType;
@Slf4j
public class Notifier
{
private enum OSType
{
Windows, MacOS, Linux, Other
}
// Default timeout of notification in milliseconds
private static final int DEFAULT_TIMEOUT = 10000;
private static final String DOUBLE_QUOTE = "\"";
private static final Escaper SHELL_ESCAPE;
private static final OSType DETECTED_OS;
static
{
final Escapers.Builder builder = Escapers.builder();
builder.addEscape('"', "'");
SHELL_ESCAPE = builder.build();
final String OS = System
.getProperty("os.name", "generic")
.toLowerCase();
if ((OS.contains("mac")) || (OS.contains("darwin")))
{
DETECTED_OS = OSType.MacOS;
}
else if (OS.contains("win"))
{
DETECTED_OS = OSType.Windows;
}
else if (OS.contains("nux"))
{
DETECTED_OS = OSType.Linux;
}
else
{
DETECTED_OS = OSType.Other;
}
log.debug("Detect OS: {}", DETECTED_OS);
}
private final String appName;
@@ -114,7 +87,7 @@ public class Notifier
final String escapedMessage = SHELL_ESCAPE.escape(message);
final String escapedSubtitle = subtitle != null ? SHELL_ESCAPE.escape(subtitle) : null;
switch (DETECTED_OS)
switch (OSType.getOSType())
{
case Linux:
sendLinuxNotification(escapedTitle, escapedMessage, type);

67
runelite-client/src/main/java/net/runelite/client/util/OSType.java Normal file
View File

@@ -0,0 +1,67 @@
/*
* Copyright (c) 2018, arlyon <arlyon@me.com>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice, this
* list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
package net.runelite.client.util;
/**
* An enum and util function to determine the OS.
*/
public enum OSType
{
Windows,
MacOS,
Linux,
Other;
private final static OSType OS_TYPE;
static
{
final String OS = System
.getProperty("os.name", "generic")
.toLowerCase();
if ((OS.contains("mac")) || (OS.contains("darwin")))
{
OS_TYPE = OSType.MacOS;
}
else if (OS.contains("win"))
{
OS_TYPE = OSType.Windows;
}
else if (OS.contains("nux"))
{
OS_TYPE = OSType.Linux;
}
else
{
OS_TYPE = OSType.Other;
}
}
public static OSType getOSType()
{
return OS_TYPE;
}
}