statool/statoolinfos
statool/statoolinfos
1
0
Fork 0
Code Issues Pull requests Releases 8 Activity

Removed htmlize target directory conf.

Browse source
This commit is contained in:
Christian P. MOMON 2024-07-27 04:04:23 +02:00
parent 6bf7610328
commit 93c06e728a
4 changed files with 17 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
.classpath
View file

@ -31,5 +31,10 @@
<classpathentry kind="lib" path="lib/sqlite-jdbc-3.36.0.3.jar"/> <classpathentry kind="lib" path="lib/sqlite-jdbc-3.36.0.3.jar"/>
<classpathentry kind="lib" path="lib/mysql-jdbc-5.0.8.jar"/> <classpathentry kind="lib" path="lib/mysql-jdbc-5.0.8.jar"/>
<classpathentry kind="lib" path="lib/devinsy-strings-0.17.0.jar" sourcepath="lib/devinsy-strings-0.17.0-sources.zip"/> <classpathentry kind="lib" path="lib/devinsy-strings-0.17.0.jar" sourcepath="lib/devinsy-strings-0.17.0-sources.zip"/>
<classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.eclipse.jst.server.tomcat.runtimeTarget/apache-tomcat-10.1.12">
<attributes>
<attribute name="owner.project.facets" value="jst.utility"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="bin"/> <classpathentry kind="output" path="bin"/>
</classpath> </classpath>

1
.settings/org.eclipse.wst.common.project.facet.core.xml
View file

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<faceted-project> <faceted-project>
<runtime name="apache-tomcat-10.1.12"/>
<fixed facet="java"/> <fixed facet="java"/>
<fixed facet="jst.utility"/> <fixed facet="jst.utility"/>
<installed facet="jst.utility" version="1.0"/> <installed facet="jst.utility" version="1.0"/>

49
src/fr/devinsy/statoolinfos/HtmlizerContext.java
View file

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020 Christian Pierre MOMON <christian@momon.org> * Copyright (C) 2020-2024 Christian Pierre MOMON <christian@momon.org>
* *
* This file is part of StatoolInfos, simple service statistics tool. * This file is part of StatoolInfos, simple service statistics tool.
* *
@ -30,17 +30,17 @@ import fr.devinsy.statoolinfos.crawl.CrawlCache;
import fr.devinsy.statoolinfos.uptime.UptimeJournal; import fr.devinsy.statoolinfos.uptime.UptimeJournal;
/** /**
* The Class Manager. * The Class HtmlizerContext.
*/ */
public class HtmlizerContext public class HtmlizerContext
{ {
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HtmlizerContext.class);
private static class SingletonHolder private static class SingletonHolder
{ {
private static final HtmlizerContext instance = new HtmlizerContext(); private static final HtmlizerContext instance = new HtmlizerContext();
} }
private static final org.slf4j.Logger logger = org.slf4j.LoggerFactory.getLogger(HtmlizerContext.class);
private Configuration configuration; private Configuration configuration;
private Federation federation; private Federation federation;
private Categories categories; private Categories categories;
@ -68,35 +68,18 @@ public class HtmlizerContext
logger.info("Cache setting: {}", this.configuration.getCrawlCachePath()); logger.info("Cache setting: {}", this.configuration.getCrawlCachePath());
logger.info("Htmlize input setting: {}", this.configuration.getHtmlizeInputURL()); logger.info("Htmlize input setting: {}", this.configuration.getHtmlizeInputURL());
logger.info("Htmlize directory setting: {}", this.configuration.getHtmlizeDirectoryPath());
this.cache = new CrawlCache(this.configuration.getCrawlCacheDirectory()); this.cache = new CrawlCache(this.configuration.getCrawlCacheDirectory());
File htmlizeDirectory = this.configuration.getHtmlizeDirectory(); if (this.configuration.isFederation())
if (htmlizeDirectory == null)
{ {
throw new IllegalArgumentException("Htmlize directory undefined."); this.federation = Factory.loadFederation(this.configuration.getHtmlizeInputURL(), this.cache);
} this.categories = Factory.loadCategories(this.configuration.getCategoryFile(), this.federation);
else if (!htmlizeDirectory.exists()) this.uptimeJournal = this.cache.restoreUptimeJournal();
{
throw new IllegalArgumentException("Htmlize directory is missing.");
}
else if (!htmlizeDirectory.isDirectory())
{
throw new IllegalArgumentException("Htmlize directory is not a directory.");
} }
else else
{ {
if (this.configuration.isFederation()) throw new IllegalArgumentException("Not a federation configuration.");
{
this.federation = Factory.loadFederation(this.configuration.getHtmlizeInputURL(), this.cache);
this.categories = Factory.loadCategories(this.configuration.getCategoryFile(), this.federation);
this.uptimeJournal = this.cache.restoreUptimeJournal();
}
else
{
throw new IllegalArgumentException("Not a federation configuration.");
}
} }
} }
@ -161,20 +144,10 @@ public class HtmlizerContext
} }
/** /**
* Htmlize directory. * Gets the uptime journal.
* *
* @return the file * @return the uptime journal
*/ */
public File getHtmlizeDirectory()
{
File result;
result = this.configuration.getHtmlizeDirectory();
//
return result;
}
public UptimeJournal getUptimeJournal() public UptimeJournal getUptimeJournal()
{ {
return this.uptimeJournal; return this.uptimeJournal;

38
src/fr/devinsy/statoolinfos/core/Configuration.java
View file

@ -317,44 +317,6 @@ public class Configuration extends PathPropertyList
return result; return result;
} }
/**
* Gets the htmlize directory.
*
* @return the htmlize directory
*/
public File getHtmlizeDirectory()
{
File result;
String path = getHtmlizeDirectoryPath();
if (StringUtils.isBlank(path))
{
result = null;
}
else
{
result = new File(path);
}
//
return result;
}
/**
* Gets the htmlize directory path.
*
* @return the htmlize directory path
*/
public String getHtmlizeDirectoryPath()
{
String result;
result = get("conf.htmlize.directory");
//
return result;
}
/** /**
* Gets the htmlize input URL. * Gets the htmlize input URL.
* *