1.66.2.3 economy時、変換後動画にもlow_追加, download動画検索バグ修正

Saccubus · Dec 8, 2016 · efc9915 · efc9915
1 parent 8b9cb58
commit efc9915
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/frontend/src/saccubus/ConvertWorker.java b/frontend/src/saccubus/ConvertWorker.java
@@ -1900,6 +1900,15 @@ private boolean convertVideo() throws IOException {
 			}
 			ConvertedVideoFile = replaceFilenamePattern(ConvertedVideoFile);
 		}
+		if(VideoFile.getPath().contains(lowVideoID)){
+			String convname = ConvertedVideoFile.getPath();
+			if(!convname.contains(lowVideoID)){
+				if(convname.contains(VideoID)){
+					convname = convname.replace(VideoID, lowVideoID);
+				}
+				ConvertedVideoFile = new File(convname);
+			}
+		}
 		if (ConvertedVideoFile.getAbsolutePath().equals(VideoFile.getAbsolutePath())){
 			sendtext("変換後のファイル名が変換前と同じです");
 			result = "96";

diff --git a/frontend/src/saccubus/MainFrame.java b/frontend/src/saccubus/MainFrame.java
@@ -3778,6 +3778,12 @@ public void CheckDownloadVideoButton_actionPerformed(ActionEvent e){
 				"ダウンロード動画情報").getTextArea();
 			File inputVideo = null;
 			ConvertingSetting setting = getSetting();
+			url = VideoID_TextField.getText();
+			if(url==null || url.isEmpty()){
+				sendtext("URL/IDが入力されていません");
+				log.println("変換ボタンが押されたがURL/ID欄が入力されていません");
+				return;
+			}
 			ConvertWorker conv = new ConvertWorker(
 					0,
 					url,