ziver/zutil
1
0
Fork 0
Code Issues Pull requests Activity Actions

Some updates to Osal

Browse source
This commit is contained in:
Ziver Koc 2013-12-19 19:57:06 +00:00
parent 19611e9fe7
commit c7674a50bb
3 changed files with 18 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/zutil/osal/OSAbstractionLayer.java
View file

@ -26,7 +26,7 @@ import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.util.LinkedList;
import java.util.ArrayList;
/**
* User: Ziver
@ -53,15 +53,15 @@ public abstract class OSAbstractionLayer {
}
/**
* Executes a command and returns the result
* Executes a command and returns the first line of the result
*
* @param cmd the command to run
* @return the first line of the output of the command or null if there where no output
* @return first line of the command
*/
protected String runCommand(String cmd) throws InterruptedException, IOException {
LinkedList<String> output = runCommand(cmd, 0, 1);
if(!output.isEmpty())
return output.getFirst();
protected String getFirstLineFromCommand(String cmd) throws InterruptedException, IOException {
String[] tmp = runCommand(cmd);
if(tmp.length > 1)
return tmp[0];
return null;
}
@ -69,39 +69,22 @@ public abstract class OSAbstractionLayer {
* Executes a command and returns the result
*
* @param cmd the command to run
* @param offsetLine the number of lines to skip at the beginning
* @return the first line after the offset of the output of the command or null if there where no output
*/
protected String runCommand(String cmd, int offsetLine) throws InterruptedException, IOException {
LinkedList<String> output = runCommand(cmd, offsetLine, 1);
if(!output.isEmpty())
return output.getFirst();
return null;
}
/**
* Executes a command and returns the result
*
* @param cmd the command to run
* @param offsetLine the number of lines to skip at the beginning
* @param lineCount the number of lines to read
* @return a String list of the output of the command
*/
protected LinkedList<String> runCommand(String cmd, int offsetLine, int lineCount) throws InterruptedException, IOException {
public String[] runCommand(String cmd) throws InterruptedException, IOException {
Runtime runtime = Runtime.getRuntime();
Process proc = runtime.exec( cmd );
Process proc = runtime.exec(cmd);
proc.waitFor();
BufferedReader output = new BufferedReader(new InputStreamReader(proc.getInputStream()));
LinkedList<String> ret = new LinkedList<String>();
String line = "";
for(int i=0; (line = output.readLine()) != null &&
(lineCount <= 0 || i < offsetLine+lineCount); i++) {
if(i >= offsetLine)
ret.addLast(line);
ArrayList<String> ret = new ArrayList<String>();
String line;
while((line = output.readLine()) != null){
ret.add(line);
}
output.close();
return ret;
return ret.toArray(new String[1]);
}
/**

4
src/zutil/osal/OsalLinuxImpl.java
View file

@ -46,7 +46,7 @@ public class OsalLinuxImpl extends OSAbstractionLayer {
@Override
public String getKernelVersion() {
try{
return super.runCommand("uname -r");
return super.getFirstLineFromCommand("uname -r");
} catch(Exception e){
e.printStackTrace();
}
@ -56,7 +56,7 @@ public class OsalLinuxImpl extends OSAbstractionLayer {
@Override
public String getUsername() {
try{
return super.runCommand("whoami");
return super.getFirstLineFromCommand("whoami");
} catch(Exception e){
e.printStackTrace();
}

3
src/zutil/osal/OsalWindowsImpl.java
View file

@ -23,7 +23,6 @@
package zutil.osal;
import java.io.File;
import java.io.IOException;
/**
* User: ezivkoc
@ -47,7 +46,7 @@ public class OsalWindowsImpl extends OSAbstractionLayer {
@Override
public String getKernelVersion() {
try {
return runCommand("ver");
return getFirstLineFromCommand("ver");
} catch (Exception e) {
e.printStackTrace();
}