Commit 68d081fc authored by Liang Ding's avatar Liang Ding

🎨 #12948

parent 1a63cfce
......@@ -28,17 +28,19 @@ import org.b3log.latke.logging.Logger;
import org.b3log.latke.service.annotation.Service;
import org.b3log.latke.util.Strings;
import org.b3log.solo.model.Article;
import org.b3log.solo.util.Skins;
import org.json.JSONObject;
import org.yaml.snakeyaml.Yaml;
import java.io.File;
import java.net.URI;
import java.util.*;
/**
* Import service.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.0.1.5, Mar 20, 2019
* @version 1.0.1.6, Nov 22, 2019
* @since 2.2.0
*/
@Service
......@@ -72,6 +74,16 @@ public class ImportService {
*/
public void importMarkdowns() {
new Thread(() -> {
try {
final URI uri = Skins.class.getResource("/markdowns").toURI();
if ("jar".equals(uri.getScheme())) {
LOGGER.info("Ignored import markdowns when running in jar");
return;
}
} catch (final Exception e) {
return;
}
final File markdownsPath = Latkes.getFile("/markdowns");
LOGGER.debug("Import directory [" + markdownsPath.getPath() + "]");
......
......@@ -48,7 +48,7 @@ import java.util.stream.Stream;
* Skin utilities.
*
* @author <a href="http://88250.b3log.org">Liang Ding</a>
* @version 1.1.6.8, Nov 19, 2019
* @version 1.1.6.9, Nov 22, 2019
* @since 0.3.1
*/
public final class Skins {
......@@ -207,7 +207,12 @@ public final class Skins {
final URI uri = Skins.class.getResource("/skins").toURI();
Path resourcePath;
if (uri.getScheme().equals("jar")) {
final FileSystem fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
FileSystem fileSystem;
try {
fileSystem = FileSystems.getFileSystem(uri);
} catch (final FileSystemNotFoundException e) {
fileSystem = FileSystems.newFileSystem(uri, Collections.emptyMap());
}
resourcePath = fileSystem.getPath("/skins");
} else {
resourcePath = Paths.get(uri);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment