Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
solo-1
Project overview
Project overview
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
solo-1
Commits
68d081fc
Unverified
Commit
68d081fc
authored
Nov 22, 2019
by
Liang Ding
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
🎨
#12948
parent
1a63cfce
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
20 additions
and
3 deletions
+20
-3
src/main/java/org/b3log/solo/service/ImportService.java
src/main/java/org/b3log/solo/service/ImportService.java
+13
-1
src/main/java/org/b3log/solo/util/Skins.java
src/main/java/org/b3log/solo/util/Skins.java
+7
-2
No files found.
src/main/java/org/b3log/solo/service/ImportService.java
View file @
68d081fc
...
...
@@ -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
()
+
"]"
);
...
...
src/main/java/org/b3log/solo/util/Skins.java
View file @
68d081fc
...
...
@@ -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
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment