From cb1f2e3ef34b6b5ff993d065f0c8635f0ee7b516 Mon Sep 17 00:00:00 2001 From: yuki Date: Sat, 16 May 2009 06:08:40 +0000 Subject: [PATCH] =?utf8?q?=E3=83=AD=E3=82=B0=E5=87=BA=E5=8A=9B=E4=BF=AE?= =?utf8?q?=E6=AD=A3.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: http://192.168.11.7/svn/repository/NicoBrowserBranches/release_20090323/NicoBrowser@111 bdf3b611-c98c-6041-8292-703d9c9adbe7 --- src/log4j.properties | 4 +++- src/nicobrowser/Config.java | 5 +++++ src/nicobrowser/NicoHttpClient.java | 31 ++++++++++++++++--------------- src/nicobrowser/main/Main.java | 21 ++++++++++++++++----- 4 files changed, 40 insertions(+), 21 deletions(-) diff --git a/src/log4j.properties b/src/log4j.properties index 0a67723..e53c8bf 100644 --- a/src/log4j.properties +++ b/src/log4j.properties @@ -4,4 +4,6 @@ log4j.appender.stdout.Target=System.out log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d %5p - %m%n -log4j.rootLogger= DEBUG, stdout +# log4j.logger.nicobrowser=debug, stdout + +log4j.rootLogger=info, stdout diff --git a/src/nicobrowser/Config.java b/src/nicobrowser/Config.java index 2966960..57507ae 100644 --- a/src/nicobrowser/Config.java +++ b/src/nicobrowser/Config.java @@ -7,9 +7,12 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; public final class Config { + private static Log log = LogFactory.getLog(Config.class); private static Config instance; private final Properties properties; private final static String APPLICATION_NAME = "nicobrowser"; @@ -32,6 +35,8 @@ public final class Config { InputStream is = new FileInputStream(config); currentProperties.load(is); is.close(); + } else { + log.info("設定ファイルを新規作成: " + config.getCanonicalPath()); } properties = createNewProperties(currentProperties, appHome.toString()); diff --git a/src/nicobrowser/NicoHttpClient.java b/src/nicobrowser/NicoHttpClient.java index 076d686..21a76db 100644 --- a/src/nicobrowser/NicoHttpClient.java +++ b/src/nicobrowser/NicoHttpClient.java @@ -118,7 +118,7 @@ public class NicoHttpClient extends DefaultHttpClient { auth = true; } } catch (IOException ex) { - log.fatal("ログイン時に問題が発生", ex); + log.error("ログイン時に問題が発生", ex); } return auth; } @@ -139,7 +139,7 @@ public class NicoHttpClient extends DefaultHttpClient { } response.getEntity().consumeContent(); } catch (IOException ex) { - log.fatal("ログアウト時に問題が発生", ex); + log.error("ログアウト時に問題が発生", ex); } return result; } @@ -176,7 +176,7 @@ public class NicoHttpClient extends DefaultHttpClient { is.close(); } } catch (IOException ex) { - log.fatal("検索結果処理時に例外発生", ex); + log.error("検索結果処理時に例外発生", ex); } return conts; } @@ -201,15 +201,15 @@ public class NicoHttpClient extends DefaultHttpClient { list = getNicoContents(reader); response.getEntity().consumeContent(); } catch (FeedException ex) { - log.fatal("", ex); + log.error("", ex); } catch (IOException ex) { - log.fatal("", ex); + log.error("", ex); } finally { if (reader != null) { try { reader.close(); } catch (IOException ex) { - log.fatal("", ex); + log.error("", ex); } } } @@ -236,15 +236,16 @@ public class NicoHttpClient extends DefaultHttpClient { reader = new BufferedReader(new InputStreamReader(response.getEntity().getContent(), "UTF-8")); contList = getNicoContents(reader); } catch (FeedException ex) { - log.fatal("FeedExceitpion" + listNo, ex); + log.warn("マイリストにアクセスできません: " + url); + log.debug("", ex); } catch (IOException ex) { - log.fatal("", ex); + log.error("", ex); } finally { if (reader != null) { try { reader.close(); } catch (IOException ex) { - log.fatal("", ex); + log.error("", ex); } } } @@ -301,18 +302,18 @@ public class NicoHttpClient extends DefaultHttpClient { // } catch (ParseException ex) { // Logger.getLogger(NicoHttpClient.class.getName()).log(Level.SEVERE, null, ex); } catch (SAXException ex) { - log.fatal("", ex); + log.error("", ex); } catch (IOException ex) { - log.fatal("", ex); + log.error("", ex); } catch (ParserConfigurationException ex) { - log.fatal("", ex); + log.error("", ex); } finally { try { if (re != null) { re.close(); } } catch (IOException ex) { - log.fatal("", ex); + log.error("", ex); } } return cont; @@ -415,7 +416,7 @@ public class NicoHttpClient extends DefaultHttpClient { Reader reader = new StringReader(sc.getValue()); new ParserDelegator().parse(reader, callBack, true); } catch (IOException ex) { - log.fatal("RSSの読み込み失敗: " + content.getTitle()); + log.error("RSSの読み込み失敗: " + content.getTitle()); } } @@ -435,7 +436,7 @@ public class NicoHttpClient extends DefaultHttpClient { * @return FLVファイル実体があるURL. * @throws java.io.IOException ファイル取得失敗. 権限の無いファイルを取得しようとした場合も. */ - public URL getFlvUrl(String videoID) throws IOException, URISyntaxException, HttpException, InterruptedException { + public URL getFlvUrl(String videoID) throws IOException { String accessUrl = GET_FLV_INFO + videoID; HttpGet get = new HttpGet(accessUrl); String resultString; diff --git a/src/nicobrowser/main/Main.java b/src/nicobrowser/main/Main.java index 2c6fe46..db05ae4 100644 --- a/src/nicobrowser/main/Main.java +++ b/src/nicobrowser/main/Main.java @@ -2,11 +2,14 @@ package nicobrowser.main; import java.io.File; +import java.io.IOException; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; import javax.persistence.EntityTransaction; @@ -31,13 +34,21 @@ public class Main { log.info("program start"); Config config = Config.getInstance(); + File saveLoc = new File(config.getSrcSaveDir()); + if (!saveLoc.isDirectory()) { + try { + log.fatal("ディレクトリが存在しません: " + saveLoc.getCanonicalPath()); + } catch (IOException ex) { + log.fatal("コンフィグファイルの記述が不正です: " + config.getSrcSaveDir()); + } + return; + } List dailyList = null; ArrayList> myLists = new ArrayList>(); NicoHttpClient instance = null; try { log.info("リストを取得します"); instance = NicoHttpClient.getInstance(); - //list = instance.loadMyList("4315046"); dailyList = instance.loadMyListDaily(); String[] mylists = config.getDownLoadMyList(); for (String l : mylists) { @@ -101,12 +112,12 @@ public class Main { } } prevDate = Calendar.getInstance().getTime(); - File saveDir = new File(config.getSrcSaveDir(), c.getFileName()); - log.info("ファイルを取得します: " + saveDir.getCanonicalPath()); + File saveLocation = new File(config.getSrcSaveDir(), c.getFileName()); + log.info("ファイルを取得します: " + c.getFileName()); Status status; try { status = instance.getFlvFile(c.getNicoId(), - saveDir.getCanonicalPath(), c.getStatus(), + saveLocation.getCanonicalPath(), c.getStatus(), config.isExtMp4Use()); c.setStatus(status); if (status == Status.GET_INFO) { @@ -114,7 +125,7 @@ public class Main { } } catch (Exception ex) { c.setFailTimes(c.getFailTimes() + 1); - log.fatal("ファイル取得に失敗しました。" + c.getNicoId() + ", 通算失敗回数: " + c.getFailTimes(), ex); + log.error("ファイル取得に失敗しました。" + c.getNicoId() + ", 通算失敗回数: " + c.getFailTimes(), ex); } transaction.begin(); manager.persist(c); -- 2.11.0