1.67.6.22 バグfix

Saccubus · Jun 19, 2017 · 10a7a04 · 10a7a04
1 parent fcca37d
commit 10a7a04
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 5 deletions.
diff --git a/frontend/src/saccubus/ConvertWorker.java b/frontend/src/saccubus/ConvertWorker.java
@@ -1910,6 +1910,8 @@ private boolean convertCommentJson(){
 		File folder = Setting.getCommentFixFileNameFolder();
 		if(isConvertWithComment()){
 			if(Setting.isCommentFixFileName()){
+				if(CommentFile == null)
+					setupCommentFile0();
 				if(commentJson==null){
 					String jsonname = detectTitleFromCommentJson(folder);
 					if(jsonname == null){
@@ -1931,10 +1933,6 @@ private boolean convertCommentJson(){
 			// commentJsonは読めた。
 			if(isConvertWithOwnerComment()){
 				//投稿者コメント作成
-				if(CommentFile == null && !setupCommentFile0()){
-					// 以下は実行不可
-					return true;
-				}
 				if(OwnerCommentFile==null){
 					String basename = CommentFile.getPath().replace(prefix, "");
 					OwnerCommentFile = Path.getReplacedExtFile(new File(basename), OWNER_EXT);
@@ -1949,6 +1947,8 @@ private boolean convertCommentJson(){
 							OwnerCommentFile.delete();
 					}
 				}
+				if(OwnerCommentFile.length()==0)
+					OwnerCommentFile.delete();
 			}
 			boolean backup;
 			ArrayList<File> filelist = new ArrayList<>();
@@ -2013,6 +2013,12 @@ private boolean convertCommentJson(){
 					}
 				}
 			}
+			if(!CommentFile.canRead()||CommentFile.length()==0)
+				CommentFile.delete();
+			if(!OptionalThreadFile.canRead()||OptionalThreadFile.length()==0)
+				OptionalThreadFile.delete();
+			if(!nicosCommentFile.canRead()||nicosCommentFile.length()==0)
+				nicosCommentFile.delete();
 		}
 		return true;
 	}
@@ -2096,6 +2102,11 @@ private boolean convertComment(){
 			}
 			//combine ファイル内ダブリも削除
 			filelist.clear();
+			if(!CommentFile.canRead()||CommentFile.length()==0){
+				CommentMiddleFile = null;
+				// But OK!
+				return true;
+			}
 			filelist.add(CommentFile);
 			CombinedCommentFile = mkTemp(TMP_COMBINED_XML3);
 			sendtext("コメントファイルマージ中");
@@ -2257,6 +2268,11 @@ private boolean convertOprionalThread(){
 			}
 			//combine ファイル内ダブリも削除
 			filelist.clear();
+			if(!OptionalThreadFile.canRead()||OptionalThreadFile.length()==0){
+				OptionalMiddleFile = null;
+				// But OK!
+				return true;
+			}
 			filelist.add(OptionalThreadFile);
 			CombinedOptionalFile = mkTemp(TMP_COMBINED_XML4);
 			sendtext("オプショナルスレッドマージ中");

diff --git a/frontend/src/saccubus/MainFrame_AboutBox.java b/frontend/src/saccubus/MainFrame_AboutBox.java
@@ -52,7 +52,7 @@ public class MainFrame_AboutBox extends JDialog implements ActionListener {
 
 //	String version = "ver1.22r(2008/04/27)";
 
-	public static final String rev = "1.67.6.21";
+	public static final String rev = "1.67.6.22";
 	private static final String modefied = " (2017/06/19)";
 
 	String productHTML =