Skip to content

Adjustment directory #343

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 24, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import com.alibaba.fastjson.JSONObject;
import com.intellij.openapi.project.Project;
import com.intellij.ui.JBColor;
import com.shuzijun.leetcode.plugin.model.Constant;
import com.shuzijun.leetcode.plugin.model.Question;
import com.shuzijun.leetcode.plugin.model.Solution;
import com.shuzijun.leetcode.plugin.setting.PersistentConfig;
Expand Down Expand Up @@ -35,7 +36,7 @@ public class ArticleManager {

public static void openArticle(Question question, Project project) {

String filePath = PersistentConfig.getInstance().getTempFilePath() + "doc" + File.separator + question.getArticleSlug() + ".md";
String filePath = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_SOLUTION + question.getArticleSlug() + ".md";

File file = new File(filePath);
if (!file.exists()) {
Expand Down Expand Up @@ -118,7 +119,7 @@ public static String formatMarkdown(String content, Project project) {
String group = latexMatcher.group();
if (group.contains("\\")) {
String fileName = "p_" + group.replaceAll("\\$+| |/|>|<|\\(|\\)|\\s|\\[|]", "_").replace("\\", "") + ".png";
String filePath = PersistentConfig.getInstance().getTempFilePath() + "doc" + File.separator + fileName;
String filePath = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_SOLUTION + fileName;
File file = new File(filePath);
if (!file.exists()) {
if (!file.getParentFile().exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ public static void openContent(Question question, Project project) {
return;
}

String filePath = PersistentConfig.getInstance().getTempFilePath() + VelocityUtils.convert(config.getCustomFileName(), question) + ".md";
String filePath = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_CONTENT + VelocityUtils.convert(config.getCustomFileName(), question) + ".md";

File file = new File(filePath);
if (file.exists()) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public static List<Question> getQuestionService(Project project, String url) {
}

if (questionList != null && !questionList.isEmpty()) {
String filePath = PersistentConfig.getInstance().getTempFilePath() + ALLNAME;
String filePath = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_PATH + ALLNAME;
FileUtils.saveFile(filePath, JSON.toJSONString(questionList));
QUESTIONLIST = questionList;
}
Expand All @@ -63,7 +63,7 @@ public static List<Question> getQuestionCache() {
return QUESTIONLIST;
}

String filePath = PersistentConfig.getInstance().getTempFilePath() + ALLNAME;
String filePath = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_PATH + ALLNAME;
String body = FileUtils.getFileBody(filePath);

if (StringUtils.isBlank(body)) {
Expand Down Expand Up @@ -264,7 +264,7 @@ private static void translation(List<Question> questions) {

if (URLUtils.isCn() && !PersistentConfig.getInstance().getConfig().getEnglishContent()) {

String filePathTranslation = PersistentConfig.getInstance().getTempFilePath() + TRANSLATIONNAME;
String filePathTranslation = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_PATH + TRANSLATIONNAME;

try {
HttpRequest httpRequest = HttpRequest.post(URLUtils.getLeetcodeGraphql(), "application/json");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.intellij.openapi.project.Project;
import com.shuzijun.leetcode.plugin.model.CodeTypeEnum;
import com.shuzijun.leetcode.plugin.model.Config;
import com.shuzijun.leetcode.plugin.model.Question;
import com.shuzijun.leetcode.plugin.model.Submission;
import com.shuzijun.leetcode.plugin.model.*;
import com.shuzijun.leetcode.plugin.setting.PersistentConfig;
import com.shuzijun.leetcode.plugin.utils.*;
import org.apache.commons.lang.StringUtils;
Expand Down Expand Up @@ -72,7 +69,7 @@ public static void openSubmission(Submission submission, Question question, Proj
}
Config config = PersistentConfig.getInstance().getInitConfig();
CodeTypeEnum codeTypeEnum = CodeTypeEnum.getCodeTypeEnumByLangSlug(submission.getLang());
String filePath = PersistentConfig.getInstance().getTempFilePath() + VelocityUtils.convert(config.getCustomFileName(), question) + submission.getId() + ".txt";
String filePath = PersistentConfig.getInstance().getTempFilePath() + Constant.DOC_SUBMISSION + VelocityUtils.convert(config.getCustomFileName(), question) + submission.getId() + ".txt";

File file = new File(filePath);
if (file.exists()) {
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/shuzijun/leetcode/plugin/model/Constant.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package com.shuzijun.leetcode.plugin.model;

import java.io.File;

/**
* 常量
*
Expand Down Expand Up @@ -99,5 +101,13 @@ public class Constant {
public static final String SORT_TYPE_DIFFICULTY = "SortByDifficulty";
public static final String SORT_TYPE_FREQUENCY = "SortByFrequency";

/**
* path
*/
public static final String DOC_PATH = "doc"+ File.separator;
public static final String DOC_SOLUTION = "doc"+ File.separator + "solution" + File.separator;
public static final String DOC_CONTENT = "doc"+ File.separator + "content" + File.separator;
public static final String DOC_SUBMISSION = "doc"+ File.separator + "submission" + File.separator;


}