StarMirror/gitpitch
1
0
Fork 0
mirror of https://github.com/gitpitch/gitpitch.git synced 2024-04-18 07:30:55 +08:00
Code Issues Projects Releases Wiki Activity

Added support for title arg on code and gist delims.

Browse Source
This commit is contained in:
David Russell 2017-09-04 15:31:45 +07:00
parent 748f8c5733
commit 937eaf7162
3 changed files with 59 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/com/gitpitch/models/MarkdownModel.java
View File

@ -708,6 +708,7 @@ public class MarkdownModel implements Markdown {
public static final String DELIM_QUERY_LANG = "lang";
public static final String DELIM_QUERY_SIZE = "size";
public static final String DELIM_QUERY_FILE = "file";
public static final String DELIM_QUERY_TITLE = "title";
public static final String MD_LINK_OPEN = "![";
public static final String MD_ANCHOR_OPEN = "[";

41
app/com/gitpitch/services/CodeService.java
View File

@ -68,6 +68,7 @@ public class CodeService {
String codePath = dp.get(MarkdownModel.DELIM_QUERY_CODE);
String langHint = dp.get(MarkdownModel.DELIM_QUERY_LANG);
String slideTitle = dp.get(MarkdownModel.DELIM_QUERY_TITLE);
GRS grs = grsManager.get(pp);
GRSService grsService = grsManager.getService(grs);
@ -77,7 +78,8 @@ public class CodeService {
if(downStatus == 0) {
String code = diskService.asText(pp, SOURCE_CODE);
return buildCodeBlock(mdm.extractCodeDelim(md), code, langHint);
return buildCodeBlock(mdm.extractCodeDelim(md),
code, langHint, slideTitle);
} else {
return buildCodeBlockError(mdm.extractCodeDelim(md), codePath);
}
@ -86,17 +88,32 @@ public class CodeService {
return codeBlock;
}
private String buildCodeBlock(String delim, String code, String langHint) {
return new StringBuffer(delim)
.append(MarkdownModel.MD_SPACER)
.append(MarkdownModel.MD_CODE_BLOCK_OPEN)
.append(langHint)
.append(MarkdownModel.MD_SPACER)
.append(code)
.append(MarkdownModel.MD_SPACER)
.append(MarkdownModel.MD_CODE_BLOCK_CLOSE)
.append(MarkdownModel.MD_SPACER)
.toString();
private String buildCodeBlock(String delim,
String code,
String langHint,
String slideTitle) {
StringBuffer slide = new StringBuffer(delim)
.append(MarkdownModel.MD_SPACER);
if(slideTitle != null) {
slide = slide.append(MarkdownModel.MD_SPACER)
.append(slideTitle)
.append(MarkdownModel.MD_SPACER);
}
slide = slide.append(MarkdownModel.MD_CODE_BLOCK_OPEN);
if(langHint != null) {
slide = slide.append(langHint);
}
return slide.append(MarkdownModel.MD_SPACER)
.append(code)
.append(MarkdownModel.MD_SPACER)
.append(MarkdownModel.MD_CODE_BLOCK_CLOSE)
.append(MarkdownModel.MD_SPACER)
.toString();
}
private String buildCodeBlockError(String delim, String codePath) {

41
app/com/gitpitch/services/GISTService.java
View File

@ -78,6 +78,7 @@ public class GISTService {
String fileHint = dp.get(MarkdownModel.DELIM_QUERY_FILE);
String langHint = dp.get(MarkdownModel.DELIM_QUERY_LANG);
String slideTitle = dp.get(MarkdownModel.DELIM_QUERY_TITLE);
String extractedDelim = mdm.extractGISTDelim(md);
GRS grs = grsManager.get(pp);
@ -92,7 +93,8 @@ public class GISTService {
if(downStatus == 0) {
String code = diskService.asText(pp, GIST_CODE);
return buildCodeBlock(extractedDelim, code, langHint);
return buildCodeBlock(extractedDelim,
code, langHint, slideTitle);
} else {
return buildCodeBlockError(extractedDelim, gid, fileHint);
}
@ -114,17 +116,32 @@ public class GISTService {
.toString();
}
private String buildCodeBlock(String delim, String code, String langHint) {
return new StringBuffer(delim)
.append(MarkdownModel.MD_SPACER)
.append(MarkdownModel.MD_CODE_BLOCK_OPEN)
.append(langHint)
.append(MarkdownModel.MD_SPACER)
.append(code)
.append(MarkdownModel.MD_SPACER)
.append(MarkdownModel.MD_CODE_BLOCK_CLOSE)
.append(MarkdownModel.MD_SPACER)
.toString();
private String buildCodeBlock(String delim,
String code,
String langHint,
String slideTitle) {
StringBuffer slide = new StringBuffer(delim)
.append(MarkdownModel.MD_SPACER);
if(slideTitle != null) {
slide = slide.append(MarkdownModel.MD_SPACER)
.append(slideTitle)
.append(MarkdownModel.MD_SPACER);
}
slide = slide.append(MarkdownModel.MD_CODE_BLOCK_OPEN);
if(langHint != null) {
slide = slide.append(langHint);
}
return slide.append(MarkdownModel.MD_SPACER)
.append(code)
.append(MarkdownModel.MD_SPACER)
.append(MarkdownModel.MD_CODE_BLOCK_CLOSE)
.append(MarkdownModel.MD_SPACER)
.toString();
}
private String buildCodeBlockError(String delim,