• R/O
  • HTTP
  • SSH
  • HTTPS

TinyBannavi: Commit

タイニー番組ナビゲータ本体


Commit MetaInfo

Revisiónf07ec08121995a03fbe59d5f21605c57da463945 (tree)
Tiempo2014-10-06 22:54:59
Autorpeeweedee <peeweedee@user...>
Commiterpeeweedee

Log Message

・EDCB:タイトルのない予約で例外

Cambiar Resumen

Diferencia incremental

--- a/TinyBannavi/src/niseRD/Server.java
+++ b/TinyBannavi/src/niseRD/Server.java
@@ -115,7 +115,7 @@ public class Server extends Thread {
115115 ma = Pattern.compile("/([^/]+\\.(htm|cgi|css|png|js|do|css))\\??(.*?)$").matcher(location);
116116 if (ma.find()) {
117117 file = ma.group(1);
118- if ( ma.groupCount() >= 3 && (ma.group(1).equals("prevLogin.cgi") || ma.group(1).equals("dispframe.cgi")) ) {
118+ if ( ma.groupCount() >= 3 && (ma.group(1).equals("prevLogin.cgi") || ma.group(1).equals("dispframe.cgi") || ma.group(1).equals("folderlist.htm")) ) {
119119 filename = folder+File.separator+ma.group(1)+"."+ma.group(3);
120120 }
121121 else if ( ma.groupCount() >= 3 && ma.group(1).equals("dvdr_ctrl.cgi") ) {
--- a/TinyBannavi/src/tainavi/AbsKeywordDialog.java
+++ b/TinyBannavi/src/tainavi/AbsKeywordDialog.java
@@ -653,7 +653,7 @@ abstract class AbsKeywordDialog extends JEscCancelDialog {
653653 TargetId ti = (TargetId) jComboBox_target.getSelectedItem();
654654 String re = (String) jComboBox_regex.getSelectedItem();
655655
656- if ( ti.getUseKeyword() && re.length() == 0 ) {
656+ if ( re == null || ti.getUseKeyword() && re.length() == 0 ) {
657657 // キーワードが必要なのに入力されていなければNG
658658 return;
659659 }
--- a/TinyBannavi/src/tainavi/AbsListedView.java
+++ b/TinyBannavi/src/tainavi/AbsListedView.java
@@ -4258,25 +4258,6 @@ public abstract class AbsListedView extends JPanel implements TickTimerListener
42584258 return true;
42594259 }
42604260
4261- @Override
4262- public String getToolTipText(MouseEvent e){
4263- // イベントからマウス位置を取得し、テーブル内のセルを割り出す
4264- int prow = rowAtPoint(e.getPoint());
4265- int row = this.convertRowIndexToModel(prow);
4266- ListedItem c = rowData.get(row);
4267- int col = columnAtPoint(e.getPoint());
4268- if ( col == ListedColumn.RSVMARK.getColumn() && c.marker != null && c.marker.rsvmark != null ) {
4269- return c.marker.rsvmark.desc;
4270- }
4271- else if ( col == ListedColumn.PICKMARK.getColumn() && c.marker != null && c.marker.pickmark != null ) {
4272- return c.marker.pickmark.desc;
4273- }
4274- else if ( col == ListedColumn.DUPMARK.getColumn() && c.dupmark != null ) {
4275- return c.dupmark.desc;
4276- }
4277- return null;
4278- }
4279-
42804261 //
42814262 @Override
42824263 public void tableChanged(TableModelEvent e) {
--- a/TinyBannavi/src/tainavi/TraceProgram.java
+++ b/TinyBannavi/src/tainavi/TraceProgram.java
@@ -86,7 +86,7 @@ public class TraceProgram {
8686 if (popDstA == null) {
8787 popDstA = popDst.toCharArray();
8888 }
89-
89+
9090 src = src.replaceAll("[  ー゙゚]", "");
9191
9292 StringBuilder sb = new StringBuilder();
--- a/TinyBannavi/src/tainavi/VersionInfo.java
+++ b/TinyBannavi/src/tainavi/VersionInfo.java
@@ -5,7 +5,7 @@ import java.util.regex.Pattern;
55
66
77 public class VersionInfo {
8- private static final String Version = "タイニー番組ナビゲータ 3.22.17β";
8+ private static final String Version = "タイニー番組ナビゲータ 3.22.18β";
99
1010 private static final String OSname = System.getProperty("os.name");
1111 private static final String OSvers = System.getProperty("os.version");
--- a/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_EDCB.java
+++ b/TinyBannavi/src/tainavi/pluginrec/PlugIn_RecRD_EDCB.java
@@ -631,7 +631,7 @@ public class PlugIn_RecRD_EDCB extends HDDRecorderUtils implements HDDRecorder,C
631631 Matcher ma = Pattern.compile("<reserveinfo>(.+?)</reserveinfo>", Pattern.DOTALL).matcher(response);
632632 while ( ma.find() ) {
633633 String id = null;
634- String title = null;
634+ String title = "";
635635 GregorianCalendar cal = null;
636636 Integer hh = null;
637637 Integer mm = null;
@@ -821,11 +821,11 @@ public class PlugIn_RecRD_EDCB extends HDDRecorderUtils implements HDDRecorder,C
821821 */
822822
823823 ReserveList r = new ReserveList();
824-
824+
825825 r.setId(getUniqId(id));
826826 r.setTitle(title);
827827 r.setTitlePop(TraceProgram.replacePop(title));
828-
828+
829829 String chid = ContentIdEDCB.getChId(onid, tsid, sid);
830830 String edcbid = ContentIdEDCB.getContentId(chid, evid);
831831 String contentid = ContentIdEDCB.stripMark(edcbid);
Show on old repository browser