タイニー番組ナビゲータ本体
Revision | a6737321e2ad2dd11fb0d96843f33a209da131dd (tree) |
---|---|
Time | 2018-09-22 23:21:07 |
Author | Masahiko Kimura <mkimura@u01....> |
Commiter | Masahiko Kimura |
Ver.1.10.1 (2018/09/22)
@@ -5,7 +5,7 @@ import java.util.regex.Pattern; | ||
5 | 5 | |
6 | 6 | |
7 | 7 | public class VersionInfo { |
8 | - private static final String Version = "タイニー番組ナビゲータ for DBR-T2007 3.22.18β+1.10"; | |
8 | + private static final String Version = "タイニー番組ナビゲータ for DBR-T2007 3.22.18β+1.10.1"; | |
9 | 9 | |
10 | 10 | private static final String OSname = System.getProperty("os.name"); |
11 | 11 | private static final String OSvers = System.getProperty("os.version"); |
@@ -3928,7 +3928,6 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
3928 | 3928 | stwin.resetWindowCloseRequested(); |
3929 | 3929 | TVProgramUtils.setCancelRequested(false); |
3930 | 3930 | |
3931 | - String msg; | |
3932 | 3931 | TVProgram tvp; |
3933 | 3932 | |
3934 | 3933 | if (TVProgramUtils.isCancelRequested()){ |
@@ -3950,6 +3949,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
3950 | 3949 | } |
3951 | 3950 | |
3952 | 3951 | if (TVProgramUtils.isCancelRequested()){ |
3952 | + loadTVProgramPostProcess(force); | |
3953 | 3953 | return false; |
3954 | 3954 | } |
3955 | 3955 | tvp = tvprograms.getCsProgPlugin(null); |
@@ -3958,6 +3958,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
3958 | 3958 | String sType = "CS番組表[プライマリ]"; |
3959 | 3959 | if (lf == LoadFor.ALL || lf == LoadFor.CS || lf == LoadFor.CSo1 || lf == LoadFor.CSwSD) { |
3960 | 3960 | if (!loadTVProgramOnce(tvp, sType, tvp.getSelectedArea(), false, force)){ |
3961 | + loadTVProgramPostProcess(force); | |
3961 | 3962 | return false; |
3962 | 3963 | } |
3963 | 3964 | } |
@@ -3967,6 +3968,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
3967 | 3968 | } |
3968 | 3969 | |
3969 | 3970 | if (TVProgramUtils.isCancelRequested()){ |
3971 | + loadTVProgramPostProcess(force); | |
3970 | 3972 | return false; |
3971 | 3973 | } |
3972 | 3974 |
@@ -3976,6 +3978,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
3976 | 3978 | String sType = "CS番組表[セカンダリ]"; |
3977 | 3979 | if (lf == LoadFor.ALL || lf == LoadFor.CS || lf == LoadFor.CSo2 || lf == LoadFor.CSwSD) { |
3978 | 3980 | if (!loadTVProgramOnce(tvp, sType, tvp.getSelectedArea(), false, force)){ |
3981 | + loadTVProgramPostProcess(force); | |
3979 | 3982 | return false; |
3980 | 3983 | } |
3981 | 3984 | } |
@@ -3985,6 +3988,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
3985 | 3988 | } |
3986 | 3989 | |
3987 | 3990 | if (TVProgramUtils.isCancelRequested()){ |
3991 | + loadTVProgramPostProcess(force); | |
3988 | 3992 | return false; |
3989 | 3993 | } |
3990 | 3994 |
@@ -4004,6 +4008,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
4004 | 4008 | } |
4005 | 4009 | |
4006 | 4010 | if (TVProgramUtils.isCancelRequested()){ |
4011 | + loadTVProgramPostProcess(force); | |
4007 | 4012 | return false; |
4008 | 4013 | } |
4009 | 4014 |
@@ -4013,31 +4018,7 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
4013 | 4018 | //pickup.save(); |
4014 | 4019 | } |
4015 | 4020 | |
4016 | - // 番組タイトルを整形する | |
4017 | - fixTitle(); | |
4018 | - fixDetail(); | |
4019 | - | |
4020 | - // 検索結果の再構築 | |
4021 | - reportTVProgramProgress(FUNCID+"検索結果を生成します."); | |
4022 | - mpList.clear(env.getDisableFazzySearch(), env.getDisableFazzySearchReverse()); | |
4023 | - mpList.build(tvprograms, trKeys.getTraceKeys(), srKeys.getSearchKeys()); | |
4024 | - | |
4025 | - // 過去ローグ | |
4026 | - if ( !env.getUsePassedProgram()) { | |
4027 | - reportTVProgramProgress(FUNCID+"過去ログは記録されません."); | |
4028 | - } | |
4029 | - else if (!force){ | |
4030 | - reportTVProgramProgress(FUNCID+"キャッシュからの読み込み時は過去ログは記録されません."); | |
4031 | - } | |
4032 | - else { | |
4033 | - TatCount tc = new TatCount(); | |
4034 | - reportTVProgramProgress(FUNCID+"過去ログを生成します."); | |
4035 | - if ( tvprograms.getPassed().save(tvprograms.getIterator(), chsort.getClst(), env.getPrepPassedProgramCount()) ) { | |
4036 | - msg = String.format(FUNCID+"過去ログを生成しました [%.2f秒].",tc.end()); | |
4037 | - reportTVProgramProgress(msg); | |
4038 | - } | |
4039 | - //PassedProgramList.getDateList(env.getPassedLogLimit()); | |
4040 | - } | |
4021 | + loadTVProgramPostProcess(force); | |
4041 | 4022 | } |
4042 | 4023 | catch (Exception e) { |
4043 | 4024 | e.printStackTrace(); |
@@ -4049,6 +4030,38 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
4049 | 4030 | return true; |
4050 | 4031 | } |
4051 | 4032 | |
4033 | + /* | |
4034 | + * 後処理 | |
4035 | + */ | |
4036 | + private void loadTVProgramPostProcess(boolean force){ | |
4037 | + final String FUNCID = "[Web番組表取得] "; | |
4038 | + | |
4039 | + // 番組タイトルを整形する | |
4040 | + fixTitle(); | |
4041 | + fixDetail(); | |
4042 | + | |
4043 | + // 検索結果の再構築 | |
4044 | + reportTVProgramProgress(FUNCID+"検索結果を生成します."); | |
4045 | + mpList.clear(env.getDisableFazzySearch(), env.getDisableFazzySearchReverse()); | |
4046 | + mpList.build(tvprograms, trKeys.getTraceKeys(), srKeys.getSearchKeys()); | |
4047 | + | |
4048 | + // 過去ログ | |
4049 | + if ( !env.getUsePassedProgram()) { | |
4050 | + reportTVProgramProgress(FUNCID+"過去ログは記録されません."); | |
4051 | + } | |
4052 | + else if (!force){ | |
4053 | + reportTVProgramProgress(FUNCID+"キャッシュからの読み込み時は過去ログは記録されません."); | |
4054 | + } | |
4055 | + else { | |
4056 | + TatCount tc = new TatCount(); | |
4057 | + reportTVProgramProgress(FUNCID+"過去ログを生成します."); | |
4058 | + if ( tvprograms.getPassed().save(tvprograms.getIterator(), chsort.getClst(), env.getPrepPassedProgramCount()) ) { | |
4059 | + reportTVProgramProgress(String.format(FUNCID+"過去ログを生成しました [%.2f秒].",tc.end())); | |
4060 | + } | |
4061 | + //PassedProgramList.getDateList(env.getPassedLogLimit()); | |
4062 | + } | |
4063 | + } | |
4064 | + | |
4052 | 4065 | // 分割 |
4053 | 4066 | private boolean loadTVProgramOnce(TVProgram tvp, String sType, String aName, boolean loadonly, boolean force) { |
4054 | 4067 |
@@ -4082,7 +4095,8 @@ public class Viewer extends JFrame implements ChangeListener,TickTimerListener,H | ||
4082 | 4095 | reportTVProgramProgress(msg); |
4083 | 4096 | if (mainWindow!=null) mwin.appendMessage(msg); |
4084 | 4097 | ringBeep(); |
4085 | - return false; | |
4098 | +// return false; | |
4099 | + return true; | |
4086 | 4100 | } |
4087 | 4101 | |
4088 | 4102 | return true; |