# HG changeset patch # User epgrec@park.mda.or.jp # Date 1269782032 -32400 # Node ID 784e3c82926e6169125df88306390887da42155c # Parent 5b192e94f49d4f835dff8be7de0b97a71d15f95a mod: yazucchiさんのパッチ取り込み diff -r 5b192e94f49d -r 784e3c82926e Keyword.class.php --- a/Keyword.class.php Sat Mar 27 16:04:54 2010 +0900 +++ b/Keyword.class.php Sun Mar 28 22:13:52 2010 +0900 @@ -37,23 +37,7 @@ $options .= " AND CONCAT(title,description) REGEXP '".mysql_real_escape_string($keyword)."'"; } else { - // 茹茹 - // 翫絲上 - $f_zennum = preg_match('/[0-9]/u', $keyword ); - $f_zenal = preg_match('/[a-zA-Z]/u', $keyword ); - - $options .= " AND ( CONCAT(title,' ',description) like '%".mysql_real_escape_string($keyword)."%'"; - - if( $f_zennum ) { - $options .= " OR CONCAT(title,' ',description) like '%".mysql_real_escape_string(mb_convert_kana( $keyword, 'KVN',"UTF-8" ))."%'"; - } - if( $f_zenal ) { - $options .= " OR CONCAT(title,' ',description) like '%".mysql_real_escape_string(mb_convert_kana( $keyword, 'KVR', "UTF-8" ))."%'"; - } - if( $f_zenal && $f_zennum ) { - $options .= " OR CONCAT(title,' ',description) like '%".mysql_real_escape_string(mb_convert_kana( $keyword, 'KVRN', "UTF-8" ))."%'"; - } - $options .= ") "; + $options .= " AND CONCAT(title,description) like _utf8'%".mysql_real_escape_string($keyword)."%' collate utf8_unicode_ci"; } } diff -r 5b192e94f49d -r 784e3c82926e config.php.sample --- a/config.php.sample Sat Mar 27 16:04:54 2010 +0900 +++ b/config.php.sample Sun Mar 28 22:13:52 2010 +0900 @@ -85,24 +85,6 @@ define( "CS1_EPG_CHANNEL", "CS8" ); // CS1 define( "CS2_EPG_CHANNEL", "CS24" ); // CS2 - -// 遺吾帥ｃ潟若settings/gr_channel.php絖 -// -if( file_exists( INSTALL_PATH."/settings/gr_channel.php" ) ) { - unset($GR_CHANNEL_MAP); - include_once( INSTALL_PATH."/settings/gr_channel.php" ); -} - -// -// settings/site_conf.php違 -// -if( file_exists( INSTALL_PATH."/settings/site_conf.php" ) ) { - unset($GR_CHANNEL_MAP); - unset($RECORD_MODE); - include_once( INSTALL_PATH."/settings/site_conf.php" ); -} - - // 順BS吾帥ｃ潟 $BS_CHANNEL_MAP = array( "3001.ontvjapan.com" => "101", @@ -225,6 +207,31 @@ */ ); + +// 遺吾帥ｃ潟若settings/gr_channel.php絖 +// +if( file_exists( INSTALL_PATH."/settings/gr_channel.php" ) ) { + unset($GR_CHANNEL_MAP); + include_once( INSTALL_PATH."/settings/gr_channel.php" ); +} + +// +// settings/site_conf.php違 +// +if( file_exists( INSTALL_PATH."/settings/site_conf.php" ) ) { + unset($GR_CHANNEL_MAP); + unset($RECORD_MODE); + include_once( INSTALL_PATH."/settings/site_conf.php" ); +} + +// Deprecated +// 鴻帥ゃ冴荐絎若荐絎若ゃ +// unset鴻帥荐絎＜ゃ莢篁祉ц +if( file_exists( INSTALL_PATH."/settings/config_custom.php" ) ) { + include_once( INSTALL_PATH."/settings/config_custom.php" ); +} + + // DB若宴篁ヤ紊眼с define( "RESERVE_TBL", "reserveTbl" ); // 篋膣若 diff -r 5b192e94f49d -r 784e3c82926e do-record.sh.pt1 --- a/do-record.sh.pt1 Sat Mar 27 16:04:54 2010 +0900 +++ b/do-record.sh.pt1 Sun Mar 28 22:13:52 2010 +0900 @@ -5,7 +5,29 @@ echo "TUNER : $TUNER" echo "TYPE : $TYPE" echo "MODE : $MODE" +echo "SID : $SID" RECORDER=/usr/local/bin/recpt1 -$RECORDER --b25 --strip $CHANNEL $DURATION ${OUTPUT} >/dev/null +# fail safe +case $CHANNEL in + 101|102|191|192|193) + if [ $SID = 'hd' ]; then + SID=$CHANNEL + fi ;; +esac +if [ -z $SID ]; then + SID='hd' +fi + +if [ ${MODE} = 0 ]; then + # MODE=0с綽≦綏ャTS冴 + $RECORDER --b25 --strip $CHANNEL $DURATION ${OUTPUT} >/dev/null +elif [ ${MODE} = 1 ]; then + # SID炊 + $RECORDER --b25 --strip --sid $SID $CHANNEL $DURATION ${OUTPUT} >/dev/null +# mode 2 example is as follows +#elif [ ${MODE} = 2 ]; then +# $RECORDER $CHANNEL $DURATION ${OUTPUT}.tmp.ts --b25 --strip +# ffmpeg -i ${OUTPUT}.tmp.ts ... 綵激с ${OUTPUT} +fi diff -r 5b192e94f49d -r 784e3c82926e do-record.sh.sample --- a/do-record.sh.sample Sat Mar 27 16:04:54 2010 +0900 +++ b/do-record.sh.sample Sun Mar 28 22:13:52 2010 +0900 @@ -9,13 +9,13 @@ RECORDER=/usr/local/bin/recfriio B25=/usr/local/bin/b25_bcas -if [ ${MODE} == 0 ]; then +if [ ${MODE} = 0 ]; then # MODE=0с綽≦綏ャTS冴 $RECORDER $CHANNEL $DURATION ${OUTPUT} --b25 --strip -elif [ ${MODE} == 1 ]; then +elif [ ${MODE} = 1 ]; then # MODE=0篁ュ罕障 $RECORDER $CHANNEL $DURATION --b25 --strip | 篏綏 >${OUTPUT} -elif [ ${MODE} == 2 ]; then +elif [ ${MODE} = 2 ]; then $RECORDER $CHANNEL $DURATION ${OUTPUT}.tmp.ts --b25 --strip ffmpeg -i ${OUTPUT}.tmp.ts ... 綵激с ${OUTPUT} fi diff -r 5b192e94f49d -r 784e3c82926e getepg.old.php --- a/getepg.old.php Sat Mar 27 16:04:54 2010 +0900 +++ b/getepg.old.php Sun Mar 28 22:13:52 2010 +0900 @@ -19,7 +19,7 @@ if( $settings->bs_tuners != 0 ) { // 牙脂茲с $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); - if( $num == 0 ) { + if( $num < $settings->bs_tuners ) { $cmdline = "CHANNEL=211 DURATION=180 TYPE=BS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." /BS ".$settings->temp_data." ".$settings->temp_xml; @@ -32,7 +32,7 @@ // CS if ($settings->cs_rec_flg != 0) { $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); - if( $num == 0 ) { + if( $num < $settings->bs_tuners ) { $cmdline = "CHANNEL=CS8 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; @@ -42,7 +42,7 @@ if( file_exists( $settings->temp_xml ) ) @unlink( $settings->temp_xml ); } $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); - if( $num == 0 ) { + if( $num < $settings->bs_tuners ) { $cmdline = "CHANNEL=CS24 DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$settings->temp_xml; @@ -59,7 +59,7 @@ foreach( $GR_CHANNEL_MAP as $key=>$value ){ // 牙脂茲с $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND type = 'GR' AND endtime > now() AND starttime < addtime( now(), '00:01:10')" ); - if( $num == 0 ) { + if( $num < $settings->gr_tuners ) { $cmdline = "CHANNEL=".$value." DURATION=60 TYPE=GR TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." ".$key." ".$settings->temp_data." ".$settings->temp_xml; diff -r 5b192e94f49d -r 784e3c82926e getepg.php --- a/getepg.php Sat Mar 27 16:04:54 2010 +0900 +++ b/getepg.php Sun Mar 28 22:13:52 2010 +0900 @@ -14,20 +14,20 @@ if( ! defined( "BS_EPG_CHANNEL" ) ) define( "BS_EPG_CHANNEL", "211" ); if( ! defined( "CS1_EPG_CHANNEL" ) ) define( "CS1_EPG_CHANNEL", "CS8" ); if( ! defined( "CS2_EPG_CHANNEL" ) ) define( "CS2_EPG_CHANNEL", "CS24" ); - + function check_file( $file ) { // ＜ゃ≦馹 if( ! file_exists( $file ) ) return true; - + // 1篁ヤ＜ゃゃ眼 if( (time() - filemtime( $file )) > 3600 ) { @unlink( $file ); return true; } - + return false; } - + // 筝純桁慎羞宴顄帥鴻 $use_para = false; $use_para = (function_exists( "pcntl_fork" ) && function_exists( "posix_setsid" ) && function_exists( "pcntl_signal" ) && function_exists("pcntl_setpriority")); @@ -39,19 +39,19 @@ } $settings = Settings::factory(); - + $temp_xml_bs = $settings->temp_xml."_bs"; $temp_xml_cs1 = $settings->temp_xml."_cs1"; $temp_xml_cs2 = $settings->temp_xml."_cs2"; $temp_xml_gr = $settings->temp_xml."_gr"; - + if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); - + // BS if( $settings->bs_tuners != 0 ) { // 牙脂茲с $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); - if( ($num == 0) && check_file($temp_xml_bs) ) { + if($num < $settings->bs_tuners && check_file($temp_xml_bs)) { $cmdline = "CHANNEL=".BS_EPG_CHANNEL." DURATION=180 TYPE=BS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." /BS ".$settings->temp_data." ".$temp_xml_bs; @@ -70,7 +70,8 @@ // CS if ($settings->cs_rec_flg != 0) { $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); - if( ($num == 0) && check_file($temp_xml_cs1) ) { + if($num < $settings->bs_tuners && check_file($temp_xml_cs1)) { + $cmdline = "CHANNEL=".CS1_EPG_CHANNEL." DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$temp_xml_cs1; @@ -86,7 +87,7 @@ if( file_exists( $settings->temp_data ) ) @unlink( $settings->temp_data ); } $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND (type = 'BS' OR type = 'CS') AND endtime > now() AND starttime < addtime( now(), '00:03:05')" ); - if( ($num == 0) && check_file($temp_xml_cs2) ) { + if( ($num < $settings->bs_tuners) && check_file($temp_xml_cs2) ) { $cmdline = "CHANNEL=".CS2_EPG_CHANNEL." DURATION=120 TYPE=CS TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." /CS ".$settings->temp_data." ".$temp_xml_cs2; @@ -103,13 +104,13 @@ } } } - + // 遺羈≪ if( $settings->gr_tuners != 0 ) { foreach( $GR_CHANNEL_MAP as $key=>$value ){ // 牙脂茲с $num = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' AND type = 'GR' AND endtime > now() AND starttime < addtime( now(), '00:01:10')" ); - if( ($num == 0) && check_file($temp_xml_gr.$value."") ) { + if($num < $settings->gr_tuners && check_file($temp_xml_gr.$value."")) { $cmdline = "CHANNEL=".$value." DURATION=60 TYPE=GR TUNER=0 MODE=0 OUTPUT=".$settings->temp_data." ".DO_RECORD . " >/dev/null 2>&1"; exec( $cmdline ); $cmdline = $settings->epgdump." ".$key." ".$settings->temp_data." ".$temp_xml_gr.$value.""; @@ -128,8 +129,8 @@ } // 筝х if( $use_para ) exit(); - + garbageClean(); // 筝荀違 doKeywordReservation(); // 若若篋膣 exit(); -?> \ No newline at end of file +?>