sendText("\93®\89æ\81E\83R\83\81\83\93\83g\82ð\95Û\91¶\82µ\81A\95Ï\8a·\82Í\8ds\82¢\82Ü\82¹\82ñ\82Å\82µ\82½\81B");
return;
}
- // TODO \96{\97\88videoFile\82Ì\8eæ\93¾\8e¸\94s\8e\9e\82Ínull\82Å\82Í\82È\82IOException\82É\82µ\82½\82¢\82ª...
- if (videoFile == null || !videoFile.isFile()) {
- throw new IOException("\93ü\97Í\93®\89æ\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82Ü\82¹\82ñ\81B");
+
+ if (!videoFile.isFile()) {
+ throw new IOException("\93ü\97Í\93®\89æ\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82Ü\82¹\82ñ:" + videoFile.getPath());
}
if (Setting.getOutputFileSetting().isAddComment()) {
- if (commentFile == null || !commentFile.isFile()) {
- throw new IOException("\93ü\97Í\83R\83\81\83\93\83g\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82Ü\82¹\82ñ\81B");
+ if (!commentFile.isFile()) {
+ throw new IOException("\93ü\97Í\83R\83\81\83\93\83g\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82Ü\82¹\82ñ:" + commentFile.getPath());
}
} else {
commentFile = null;
}
if (Setting.getOutputFileSetting().isAddTcomment()) {
- if (tcommFile == null || !tcommFile.isFile()) {
- throw new IOException("\93ü\97Í\93\8a\8de\8eÒ\83R\83\81\83\93\83g\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82Ü\82¹\82ñ\81B");
+ if (!tcommFile.isFile()) {
+ throw new IOException("\93ü\97Í\93\8a\8de\8eÒ\83R\83\81\83\93\83g\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82Ü\82¹\82ñ" + tcommFile.getPath());
}
} else {
tcommFile = null;
/*\83r\83f\83I\96¼\82Ì\8am\92è*/
File convertedVideoFile;
if (!Setting.getOutputFileSetting().getFile().isFile()) {
- if (fi.getVideoTitle() == null) {
- sendText("\95Ï\8a·\8cã\82Ì\83r\83f\83I\83t\83@\83C\83\8b\96¼\82ª\8am\92è\82Å\82«\82Ü\82¹\82ñ\81B");
- return;
- }
String conv_name = fi.getVideoTitle();
if (Setting.getOutputFileSetting().isAppendPrefixVideoId()) {
conv_name = getVideoIDWithBracket() + conv_name;
package saccubus.converter.filegetter;
import java.io.File;
+import java.io.IOException;
import saccubus.net.NicoClient;
import saccubus.net.TextProgressListener;
import saccubus.net.VideoInfo;
}
@Override
- public File get(File file, TextProgressListener listener) {
+ public File get(File file, TextProgressListener listener) throws IOException {
String com = Integer.toString(backComment);
if (this.autoCommentNum) {
com = getClient().getBackCommentFromLength(getVideoInfo(), com);
}
- return getClient().getComment(getVideoInfo(), file, listener, com);
+ File res = getClient().getComment(getVideoInfo(), file, listener, com);
+ if (res == null) {
+ throw new IOException("\83R\83\81\83\93\83g\83t\83@\83C\83\8b\82Ì\83_\83E\83\93\83\8d\81[\83h\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B");
+ }
+ return res;
}
}
package saccubus.converter.filegetter;
import java.io.File;
+import java.io.IOException;
import saccubus.net.TextProgressListener;
/**
FileGetter() {
}
- File get(File file, TextProgressListener listener) {
+ File get(File file, TextProgressListener listener) throws IOException {
return file;
}
}
package saccubus.converter.filegetter;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import org.apache.commons.io.FilenameUtils;
import saccubus.ConvertStopFlag;
import saccubus.converter.profile.InputFileSetting;
-import saccubus.converter.profile.Profile;
import saccubus.net.TextProgressListener;
/**
setTcommFileGetter(getter);
}
- /** @return \93®\89æ\82Ì\83^\83C\83g\83\8b. \95ª\82©\82ç\82È\82¢\8fê\8d\87\82Ínull. */
- public String getVideoTitle() {
+ /**
+ * @return \93®\89æ\82Ì\83^\83C\83g\83\8b.
+ * @throws FileNotFoundException \83r\83f\83I\83^\83C\83g\83\8b\82Ì\8e©\93®\96½\96¼\8e\9e\81A\8eQ\8dl\82Æ\82È\82é\83t\83@\83C\83\8b\82ª\8c©\82Â\82©\82ç\82È\82©\82Á\82½\81B
+ */
+ public String getVideoTitle() throws FileNotFoundException {
String fileName = null;
if (!videoType.isAutoFileName()) {
// \93®\89æ\83t\83@\83C\83\8b\96¼\82ð\92¼\90Ú\8ew\92è\82µ\82Ä\82¢\82é\8fê\8d\87\82Í\81A\82»\82Ì\83t\83@\83C\83\8b\96¼\82ð\8aî\82É\83^\83C\83g\83\8b\82ð\8eæ\93¾\82·\82é.
}
}
}
+ if (fileName == null) {
+ throw new FileNotFoundException(getVideoIdWithBracket() + "\82Ì\83t\83@\83C\83\8b\82ð\93Á\92è\82Å\82«\82Ü\82¹\82ñ\82Å\82µ\82½\81B");
+ }
}
- if (fileName == null) {
- return null;
- }
String baseName = FilenameUtils.getBaseName(fileName);
int s = baseName.indexOf(getVideoIdWithBracket());
return baseName.replace(getVideoIdWithBracket(), "");
* @return \93®\89æ\83t\83@\83C\83\8b.
* @throws IOException \93®\89æ\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82È\82¢, \8eæ\93¾\82É\8e¸\94s\82µ\82½.
*/
- public final File getVideoFile(TextProgressListener listener) {
+ public final File getVideoFile(TextProgressListener listener) throws IOException {
File file = new FileLocator(videoType.isAutoFileName(), videoType.getInitFile(), getVideoIdWithBracket(),
getVideoTitle(), ".flv").getFile();
file = videoFileGetter.get(file, listener);
* @return \83R\83\81\83\93\83g\83t\83@\83C\83\8b.
* @throws IOException \83R\83\81\83\93\83g\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82È\82¢, \8eæ\93¾\82É\8e¸\94s\82µ\82½.
*/
- public final File getCommentFile(TextProgressListener listener) {
+ public final File getCommentFile(TextProgressListener listener) throws IOException {
File file = new FileLocator(commentType.isAutoFileName(), commentType.getInitFile(), getVideoIdWithBracket(),
getVideoTitle(), ".xml").getFile();
file = commentFileGetter.get(file, listener);
* @return \93\8a\8de\8eÒ\83R\83\81\83\93\83g\83t\83@\83C\83\8b.
* @throws IOException \83R\83\81\83\93\83g\83t\83@\83C\83\8b\82ª\91¶\8dÝ\82µ\82È\82¢, \8eæ\93¾\82É\8e¸\94s\82µ\82½.
*/
- public final File getTcommFile(TextProgressListener listener) {
+ public final File getTcommFile(TextProgressListener listener) throws IOException {
File file = new FileLocator(tcommType.isAutoFileName(), tcommType.getInitFile(), getVideoIdWithBracket(),
getVideoTitle(), ".xml").getFile();
file = tcommFileGetter.get(file, listener);
package saccubus.converter.filegetter;
import java.io.File;
+import java.io.IOException;
import saccubus.net.NicoClient;
import saccubus.net.TextProgressListener;
import saccubus.net.VideoInfo;
}
@Override
- public File get(File file, TextProgressListener listener) {
- return getClient().getTcomment(videoInfo, file, listener);
+ public File get(File file, TextProgressListener listener) throws IOException {
+ File res = getClient().getTcomment(videoInfo, file, listener);
+ if (res == null) {
+ throw new IOException("\93\8a\8de\8eÒ\83R\83\81\83\93\83g\83t\83@\83C\83\8b\82Ì\83_\83E\83\93\83\8d\81[\83h\82É\8e¸\94s\82µ\82Ü\82µ\82½");
+ }
+ return res;
}
}
package saccubus.converter.filegetter;
import java.io.File;
+import java.io.IOException;
import saccubus.net.NicoClient;
import saccubus.net.TextProgressListener;
import saccubus.net.VideoInfo;
}
@Override
- File get(File file, TextProgressListener listener) {
+ File get(File file, TextProgressListener listener) throws IOException {
listener.setText("\93®\89æ\82Ì\83_\83E\83\93\83\8d\81[\83h\8aJ\8en\92\86");
- return client.getVideo(videoInfo, file, listener);
+ File res = client.getVideo(videoInfo, file, listener);
+ if (res == null) {
+ throw new IOException("\93®\89æ\83t\83@\83C\83\8b\82Ì\83_\83E\83\93\83\8d\81[\83h\82É\8e¸\94s\82µ\82Ü\82µ\82½\81B");
+ }
+ return res;
}
}
OSDN Git Service
