過去ログ取得時点をConverterコンストラクタ引数からProfileに移動

[coroid/inqubus.git] / frontend / src / saccubus / properties / SProperties.java

diff --git a/frontend/src/saccubus/properties/SProperties.java b/frontend/src/saccubus/properties/SProperties.java
index 450e6e3..66ab194 100644 (file)
--- a/frontend/src/saccubus/properties/SProperties.java
+++ b/frontend/src/saccubus/properties/SProperties.java
@@ -130,7 +130,7 @@ public class SProperties {
             final boolean isFile = (!setting.isAutoNaming() || setting.getProcessKind() == VideoSaveKind.NICOBROWSER);
             File video;
             if (setting.getProcessKind() == VideoSaveKind.NICOBROWSER) {
-                video = setting.getFile();
+                video = setting.getNicoBrowserFile();
             } else {
                 if (setting.isAutoNaming()) {
                     video = setting.getFolder();
@@ -142,7 +142,8 @@ public class SProperties {
             // Nicobrowserダウンロードファイルは削除対象にならない.
             boolean delete = setting.isDeleteAfterConvert() && (setting.getProcessKind() != VideoSaveKind.NICOBROWSER);
 
-            return new InputFileSetting(videoFile, (setting.getProcessKind() == VideoSaveKind.SAVE), delete);
+            return new InputFileSetting(videoFile, (setting.getProcessKind() == VideoSaveKind.SAVE), delete,
+                    buildCommentGetInfo(), inputCommentSetting.getBackLogPoint());
         }
 
         private InputFileSetting buildCommentSetting() {
@@ -151,7 +152,8 @@ public class SProperties {
 
         private CommentGetInfo buildCommentGetInfo() {
             final InputCommentSetting setting = getInputCommentSetting();
-            return new CommentGetInfo(setting.isSelfAdjustNumOfComment(), setting.getNumOfComment());
+            return new CommentGetInfo(setting.isSelfAdjustNumOfComment(), setting.getNumOfComment(), setting.
+                    isReduceComment());
         }
 
         private InputFileSetting buildTcommentSetting() {
@@ -161,7 +163,8 @@ public class SProperties {
         private InputFileSetting createCommentSetting(saccubus.properties.InputFileSetting<Boolean> setting) {
             SFile file = createSFile(setting);
 
-            return new InputFileSetting(file, setting.getProcessKind().booleanValue(), setting.isDeleteAfterConvert());
+            return new InputFileSetting(file, setting.getProcessKind().booleanValue(), setting.isDeleteAfterConvert(),
+                    buildCommentGetInfo(), inputCommentSetting.getBackLogPoint());
 
         }