boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

spike to identify paths for YaCy within mac application bundles

Browse Source
pull/436/head
Michael Peter Christen 3 years ago
parent be0aebad84
commit fd770e90e2
1 changed files with 61 additions and 45 deletions
Show Stats Download Patch File Download Diff File

62
source/net/yacy/yacy.java
Unescape View File

@ -35,6 +35,8 @@ import java.io.IOException;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.RandomAccessFile; import java.io.RandomAccessFile;
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.nio.channels.FileChannel; import java.nio.channels.FileChannel;
import java.nio.channels.FileLock; import java.nio.channels.FileLock;
import java.util.ArrayList; import java.util.ArrayList;
@ -56,6 +58,7 @@ import net.yacy.cora.date.GenericFormatter;
import net.yacy.cora.document.encoding.UTF8; import net.yacy.cora.document.encoding.UTF8;
import net.yacy.cora.document.id.MultiProtocolURL; import net.yacy.cora.document.id.MultiProtocolURL;
import net.yacy.cora.federate.solr.instance.RemoteInstance; import net.yacy.cora.federate.solr.instance.RemoteInstance;
import net.yacy.cora.plugin.ClassProvider;
import net.yacy.cora.protocol.ClientIdentification; import net.yacy.cora.protocol.ClientIdentification;
import net.yacy.cora.protocol.ConnectionInfo; import net.yacy.cora.protocol.ConnectionInfo;
import net.yacy.cora.protocol.HeaderFramework; import net.yacy.cora.protocol.HeaderFramework;
@ -166,7 +169,7 @@ public final class yacy {
try { try {
tmpdir = java.nio.file.Files.createTempDirectory("yacy-tmp-").toString(); // creates sub dir in jvm's temp (see System.property "java.io.tempdir") tmpdir = java.nio.file.Files.createTempDirectory("yacy-tmp-").toString(); // creates sub dir in jvm's temp (see System.property "java.io.tempdir")
System.setProperty("java.io.tmpdir", tmpdir); System.setProperty("java.io.tmpdir", tmpdir);
} catch (IOException ex) { } } catch (final IOException ex) { }
// setting up logging // setting up logging
f = new File(dataHome, "DATA/LOG/"); f = new File(dataHome, "DATA/LOG/");
@ -230,7 +233,7 @@ public final class yacy {
String tmpversion = sb.getConfig(Seed.VERSION, ""); String tmpversion = sb.getConfig(Seed.VERSION, "");
if (tmpversion.isEmpty()) { // before 1.83009737 only the svnRevision nr was in config (like 9737) if (tmpversion.isEmpty()) { // before 1.83009737 only the svnRevision nr was in config (like 9737)
tmpversion = yacyBuildProperties.getVersion(); tmpversion = yacyBuildProperties.getVersion();
int oldRev = Integer.parseInt(sb.getConfig("svnRevision", "0")); final int oldRev = Integer.parseInt(sb.getConfig("svnRevision", "0"));
if (oldRev > 1) { if (oldRev > 1) {
oldVer = Double.parseDouble(tmpversion) + oldRev / 100000000.0; oldVer = Double.parseDouble(tmpversion) + oldRev / 100000000.0;
} else { } else {
@ -255,7 +258,7 @@ public final class yacy {
//final File htTemplatePath = new File(homePath, sb.getConfig("htTemplatePath","htdocs")); //final File htTemplatePath = new File(homePath, sb.getConfig("htTemplatePath","htdocs"));
// create default notifier picture // create default notifier picture
File notifierFile = new File(htDocsPath, "notifier.gif"); final File notifierFile = new File(htDocsPath, "notifier.gif");
if (!notifierFile.exists()) try {Files.copy(new File(htRootPath, "env/grafics/empty.gif"), notifierFile);} catch (final IOException e) {} if (!notifierFile.exists()) try {Files.copy(new File(htRootPath, "env/grafics/empty.gif"), notifierFile);} catch (final IOException e) {}
final File htdocsReadme = new File(htDocsPath, "readme.txt"); final File htdocsReadme = new File(htDocsPath, "readme.txt");
@ -333,10 +336,10 @@ public final class yacy {
if (lang.endsWith("browser")) if (lang.endsWith("browser"))
langlist = Translator.activeTranslations(); // get all translated languages langlist = Translator.activeTranslations(); // get all translated languages
else { else {
langlist = new ArrayList<String>(); langlist = new ArrayList<>();
langlist.add(lang); langlist.add(lang);
} }
for (String tmplang : langlist) { for (final String tmplang : langlist) {
if (!tmplang.equals("") && !tmplang.equals("default") && !tmplang.equals("browser")) { //locale is used if (!tmplang.equals("") && !tmplang.equals("default") && !tmplang.equals("browser")) { //locale is used
String currentRev = null; String currentRev = null;
BufferedReader br = null; BufferedReader br = null;
@ -348,7 +351,7 @@ public final class yacy {
} finally { } finally {
try { try {
br.close(); br.close();
} catch(IOException ioe) { } catch(final IOException ioe) {
ConcurrentLog.warn("STARTUP", "Could not close " + tmplang + " version file"); ConcurrentLog.warn("STARTUP", "Could not close " + tmplang + " version file");
} }
} }
@ -502,7 +505,7 @@ public final class yacy {
System.out.println(copyright); System.out.println(copyright);
System.out.println(hline); System.out.println(hline);
final LinkedHashMap<String,ContentBody> post = new LinkedHashMap<String,ContentBody>(); final LinkedHashMap<String,ContentBody> post = new LinkedHashMap<>();
post.put("shutdown", UTF8.StringBody("")); post.put("shutdown", UTF8.StringBody(""));
submitPostURL(homePath, "Steering.html", "Terminate YaCy", post); submitPostURL(homePath, "Steering.html", "Terminate YaCy", post);
} }
@ -634,7 +637,7 @@ public final class yacy {
* @param dataHome data directory * @param dataHome data directory
*/ */
static private void preReadSavedConfigandInit(File dataHome) { static private void preReadSavedConfigandInit(File dataHome) {
File lockFile = new File(dataHome, "DATA/yacy.running"); final File lockFile = new File(dataHome, "DATA/yacy.running");
final String conf = "DATA/SETTINGS/yacy.conf"; final String conf = "DATA/SETTINGS/yacy.conf";
// If YaCy is actually running, then we check if the server port is open. // If YaCy is actually running, then we check if the server port is open.
@ -643,10 +646,10 @@ public final class yacy {
// That will especially happen if Windows Users double-Click the YaCy Icon on the desktop to simply // That will especially happen if Windows Users double-Click the YaCy Icon on the desktop to simply
// open the web interface. (They don't think of 'servers' they just want to get to the search page). // open the web interface. (They don't think of 'servers' they just want to get to the search page).
// We need to parse the configuration file for that to get the host port // We need to parse the configuration file for that to get the host port
File configFile = new File(dataHome, conf); final File configFile = new File(dataHome, conf);
if (configFile.exists()) { if (configFile.exists()) {
Properties p = new Properties(); final Properties p = new Properties();
FileInputStream fis = null; FileInputStream fis = null;
try { try {
fis = new FileInputStream(configFile); fis = new FileInputStream(configFile);
@ -658,7 +661,7 @@ public final class yacy {
// prevents also creation of a log file while just opening browser // prevents also creation of a log file while just opening browser
System.out.println("WARNING: the file " + lockFile + " exists, this usually means that a YaCy instance is still running. If you want to restart YaCy, try first ./stopYACY.sh, then ./startYACY.sh. If ./stopYACY.sh fails, try ./killYACY.sh"); System.out.println("WARNING: the file " + lockFile + " exists, this usually means that a YaCy instance is still running. If you want to restart YaCy, try first ./stopYACY.sh, then ./startYACY.sh. If ./stopYACY.sh fails, try ./killYACY.sh");
int port = Integer.parseInt(p.getProperty(SwitchboardConstants.SERVER_PORT, "8090")); final int port = Integer.parseInt(p.getProperty(SwitchboardConstants.SERVER_PORT, "8090"));
if (TimeoutRequest.ping("127.0.0.1", port, 1000)) { if (TimeoutRequest.ping("127.0.0.1", port, 1000)) {
Browser.openBrowser("http://localhost:" + port + "/" + p.getProperty(SwitchboardConstants.BROWSER_POP_UP_PAGE, "index.html")); Browser.openBrowser("http://localhost:" + port + "/" + p.getProperty(SwitchboardConstants.BROWSER_POP_UP_PAGE, "index.html"));
// Thats it; YaCy was running, the user is happy, we can stop now. // Thats it; YaCy was running, the user is happy, we can stop now.
@ -670,7 +673,7 @@ public final class yacy {
delete(lockFile); delete(lockFile);
} }
} }
} catch (IOException ex) { } catch (final IOException ex) {
System.err.println("ERROR: config file seems to be corrupt"); System.err.println("ERROR: config file seems to be corrupt");
System.err.println("ERROR: if problem persists, delete file"); System.err.println("ERROR: if problem persists, delete file");
System.err.println(configFile.getAbsolutePath()); System.err.println(configFile.getAbsolutePath());
@ -679,7 +682,7 @@ public final class yacy {
} finally { } finally {
try { try {
fis.close(); fis.close();
} catch (IOException e) { } catch (final IOException e) {
ConcurrentLog.warn("Startup", "Could not close file " + configFile); ConcurrentLog.warn("Startup", "Could not close file " + configFile);
} }
} }
@ -717,10 +720,23 @@ public final class yacy {
if (args.length >= 1 && args[0].toLowerCase(Locale.ROOT).equals("-gui")) headless = false; if (args.length >= 1 && args[0].toLowerCase(Locale.ROOT).equals("-gui")) headless = false;
System.setProperty("java.awt.headless", headless ? "true" : "false"); System.setProperty("java.awt.headless", headless ? "true" : "false");
String s = ""; for (final String a: args) s += a + " "; final StringBuilder s = new StringBuilder(); for (final String a: args) s.append(a).append(" ");
yacyRelease.startParameter = s.trim(); yacyRelease.startParameter = s.toString().trim();
// case for the application path if started normally with a jre command
File applicationRoot = new File(System.getProperty("user.dir").replace('\\', '/')); File applicationRoot = new File(System.getProperty("user.dir").replace('\\', '/'));
// try to find the application root path within a Mac application
// call com.apple.eio.FileManager.getPathToApplicationBundle();
try {
final Class<?> comAppleEioFileManagerClass = Class.forName("com.apple.eio.FileManager");
final Method getPathToApplicationBundleMethod = ClassProvider.getStaticMethod(comAppleEioFileManagerClass, "getPathToApplicationBundle", null);
final String apppath = (String) getPathToApplicationBundleMethod.invoke(null);
System.out.println("PathToApplicationBundle = " + apppath);
} catch (ClassNotFoundException | InvocationTargetException | IllegalAccessException | IllegalArgumentException e) {
e.printStackTrace();
}
File dataRoot = applicationRoot; File dataRoot = applicationRoot;
//System.out.println("args.length=" + args.length); //System.out.println("args.length=" + args.length);
//System.out.print("args=["); for (int i = 0; i < args.length; i++) System.out.print(args[i] + ", "); System.out.println("]"); //System.out.print("args=["); for (int i = 0; i < args.length; i++) System.out.print(args[i] + ", "); System.out.println("]");
@ -760,7 +776,7 @@ public final class yacy {
} else if ((args.length > 1) && (args[0].toLowerCase(Locale.ROOT).equals("-config"))) { } else if ((args.length > 1) && (args[0].toLowerCase(Locale.ROOT).equals("-config"))) {
// set config parameter. Special handling of adminAccount=user:pwd (generates md5 encoded password) // set config parameter. Special handling of adminAccount=user:pwd (generates md5 encoded password)
// on Windows parameter should be enclosed in doublequotes to accept = sign (e.g. -config "port=8090" "port.ssl=8043") // on Windows parameter should be enclosed in doublequotes to accept = sign (e.g. -config "port=8090" "port.ssl=8043")
File f = new File (dataRoot,"DATA/SETTINGS/"); final File f = new File (dataRoot,"DATA/SETTINGS/");
if (!f.exists()) { if (!f.exists()) {
mkdirsIfNeseccary(f); mkdirsIfNeseccary(f);
} else { } else {
@ -769,21 +785,21 @@ public final class yacy {
} }
} }
// use serverSwitch to read config properties (including init values from yacy.init // use serverSwitch to read config properties (including init values from yacy.init
serverSwitch ss = new serverSwitch(dataRoot,applicationRoot,"defaults/yacy.init","DATA/SETTINGS/yacy.conf"); final serverSwitch ss = new serverSwitch(dataRoot,applicationRoot,"defaults/yacy.init","DATA/SETTINGS/yacy.conf");
for (int icnt=1; icnt < args.length ; icnt++) { for (int icnt=1; icnt < args.length ; icnt++) {
String cfg = args[icnt]; final String cfg = args[icnt];
int pos = cfg.indexOf('='); final int pos = cfg.indexOf('=');
if (pos > 0) { if (pos > 0) {
String cmd = cfg.substring(0, pos); final String cmd = cfg.substring(0, pos);
String val = cfg.substring(pos + 1); final String val = cfg.substring(pos + 1);
if (!val.isEmpty()) { if (!val.isEmpty()) {
if (cmd.equalsIgnoreCase(SwitchboardConstants.ADMIN_ACCOUNT)) { // special command to set adminusername and md5-pwd if (cmd.equalsIgnoreCase(SwitchboardConstants.ADMIN_ACCOUNT)) { // special command to set adminusername and md5-pwd
int cpos = val.indexOf(':'); //format adminAccount=adminname:adminpwd final int cpos = val.indexOf(':'); //format adminAccount=adminname:adminpwd
if (cpos >= 0) { if (cpos >= 0) {
String username = val.substring(0, cpos); String username = val.substring(0, cpos);
String pwdtxt = val.substring(cpos + 1); final String pwdtxt = val.substring(cpos + 1);
if (!username.isEmpty()) { if (!username.isEmpty()) {
ss.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME, username); ss.setConfig(SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME, username);
System.out.println("Set property " + SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME + " = " + username); System.out.println("Set property " + SwitchboardConstants.ADMIN_ACCOUNT_USER_NAME + " = " + username);

Write Preview
Loading…
Cancel
Save