# HG changeset patch # User Yoshiki Yazawa # Date 1267444296 -32400 # Node ID 36ac7c416bd741452643921e1bf2c6922d8da486 # Parent 11f63ae04a9605a4c32ce18b59b047459d439ab7# Parent c29d41d0c945313e4e85ff06ff3dbda2fd453bb2 merged with upstream diff -r c29d41d0c945 -r 36ac7c416bd7 Reservation.class.php --- a/Reservation.class.php Mon Mar 01 17:46:03 2010 +0900 +++ b/Reservation.class.php Mon Mar 01 20:51:36 2010 +0900 @@ -8,13 +8,13 @@ // 予約クラス class Reservation { - + public static function simple( $program_id , $autorec = 0, $mode = 0) { $settings = Settings::factory(); $rval = 0; try { $prec = new DBRecord( PROGRAM_TBL, "id", $program_id ); - + $rval = self::custom( $prec->starttime, $prec->endtime, @@ -25,14 +25,14 @@ $program_id, $autorec, $mode ); - + } catch( Exception $e ) { throw $e; } return $rval; } - + public static function custom( $starttime, // 開始時間Datetime型 $endtime, // 終了時間Datetime型 @@ -50,20 +50,20 @@ // 時間を計算 $start_time = toTimestamp( $starttime ); $end_time = toTimestamp( $endtime ) + $settings->extra_time; - + if( $start_time < (time() + PADDING_TIME + 10) ) { // 現在時刻より3分先より小さい＝すでに開始されている番組 $start_time = time() + PADDING_TIME + 10; // 録画開始時間を3分10秒先に設定する } $at_start = $start_time - PADDING_TIME; $sleep_time = PADDING_TIME - $settings->former_time; $rec_start = $start_time - $settings->former_time; - + // durationを計算しておく $duration = $end_time - $rec_start; if( $duration < ($settings->former_time + 60) ) { // 60秒以下の番組は弾く throw new Exception( "終わりつつある/終わっている番組です" ); } - + $rrec = null; try { // 同一番組予約チェック @@ -73,9 +73,9 @@ throw new Exception("同一の番組が録画予約されています"); } } - + $crec = new DBRecord( CHANNEL_TBL, "id", $channel_id ); - + // 既存予約数 = TUNER番号 $tuners = ($crec->type == "GR") ? $settings->gr_tuners : $settings->bs_tuners; $battings = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' ". @@ -83,7 +83,7 @@ "AND starttime < '".toDatetime($end_time) ."' ". "AND endtime > '".toDatetime($rec_start)."'" ); - + if( $battings >= $tuners ) { // 重複を発見した if( $settings->force_cont_rec == 1 ) { @@ -92,15 +92,15 @@ $nexts = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' ". "AND type = '".$crec->type."' ". "AND starttime = '".toDatetime($end_time - $settings->former_time)."'"); - + $prevs = DBRecord::countRecords( RESERVE_TBL, "WHERE complete = '0' ". "AND type = '".$crec->type."' ". "AND endtime = '".$starttime."'" ); - + // 前後を引いてもチューナー数と同数以上なら重複の解消は無理 if( ($battings - $nexts - $prevs) >= $tuners ) throw new Exception( "重複予約を解消できません" ); - + // 直後の番組はあるか? if( $nexts ) { // この番組の終わりをちょっとだけ早める @@ -108,7 +108,7 @@ $duration = $end_time - $rec_start; // durationを計算しなおす } $battings -= $nexts; - + // 直前の録画予約を見付ける $trecs = DBRecord::createRecords(RESERVE_TBL, "WHERE complete = '0' ". "AND type = '".$crec->type."' ". @@ -127,7 +127,7 @@ $prev_endtime = $trecs[$i]->endtime; $prev_autorec = $trecs[$i]->autorec; $prev_mode = $trecs[$i]->mode; - + $prev_start_time = toTimestamp($prev_starttime); // 始まっていない予約？ if( $prev_start_time > (time() + PADDING_TIME + $settings->former_time) ) { @@ -135,13 +135,13 @@ $prev_starttime = toDatetime( $prev_start_time + $settings->former_time ); // 終わりをちょっとだけずらす $prev_endtime = toDatetime( toTimestamp($prev_endtime) - $settings->former_time - $settings->rec_switch_time ); - + // tryのネスト try { // いったん予約取り消し self::cancel( $prev_id ); // 再予約 - self::custom( + self::custom( $prev_starttime, // 開始時間Datetime型 $prev_endtime, // 終了時間Datetime型 $prev_channel_id, // チャンネルID @@ -170,13 +170,13 @@ } // チューナー番号 $tuner = $battings; - + // 改めてdurationをチェックしなおす if( $duration < ($settings->former_time + 60) ) { // 60秒以下の番組は弾く throw new Exception( "終わりつつある/終わっている番組です" ); } - - + + // ここからファイル名生成 /* %TITLE% 番組タイトル @@ -197,10 +197,10 @@ $day_of_week = array( "日","月","火","水","木","金","土" ); $filename = $settings->filename_format; - + // あると面倒くさそうな文字を全部_に $fn_title = mb_ereg_replace("[ \./\*:<>\?\\|()\'\"&]","_", trim($title) ); - + // %TITLE% $filename = str_replace("%TITLE%", $fn_title, $filename); // %ST% 開始日時 @@ -229,21 +229,22 @@ $filename = str_replace("%SEC%",date("s", $start_time), $filename ); // %DURATION% 録画時間（秒） $filename = str_replace("%DURATION%","".$duration, $filename ); - + // 文字コード変換 if( defined("FILESYSTEM_ENCODING") ) { - $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" ); +// $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "UTF-8" ); + $filename = mb_convert_encoding( $filename, FILESYSTEM_ENCODING, "auto" ); } $filename .= $RECORD_MODE["$mode"]['suffix']; $thumbname = $filename.".jpg"; - + // サムネール $gen_thumbnail = INSTALL_PATH."/gen-thumbnail.sh"; - if( defined("GEN_THUMBNAIL") ) + if( defined("GEN_THUMBNAIL") ) $gen_thumbnail = GEN_THUMBNAIL; - + // ファイル名生成終了 - + // 予約レコードを埋める $rrec = new DBRecord( RESERVE_TBL ); $rrec->channel_disc = $crec->channel_disc; @@ -260,7 +261,7 @@ $rrec->autorec = $autorec; $rrec->mode = $mode; $rrec->reserve_disc = md5( $crec->channel_disc . toDatetime( $start_time ). toDatetime( $end_time ) ); - + // 予約実行 $cmdline = $settings->at." ".date("H:i m/d/Y", $at_start); $descriptor = array( 0 => array( "pipe", "r" ), @@ -278,7 +279,7 @@ "FFMPEG" => "".$settings->ffmpeg, "SID" => $crec->sid, ); - + // ATで予約する $process = proc_open( $cmdline , $descriptor, $pipes, INSTALL_PATH.$settings->spool, $env ); if( is_resource( $process ) ) { @@ -291,7 +292,7 @@ fclose($pipes[0]); // 標準エラーを取る $rstring = stream_get_contents( $pipes[2]); - + fclose( $pipes[2] ); proc_close( $process ); } @@ -328,12 +329,12 @@ } } // custom 終了 - + // 取り消し public static function cancel( $reserve_id = 0, $program_id = 0 ) { $settings = Settings::factory(); $rec = null; - + try { if( $reserve_id ) { $rec = new DBRecord( RESERVE_TBL, "id" , $reserve_id ); diff -r c29d41d0c945 -r 36ac7c416bd7 Settings.class.php --- a/Settings.class.php Mon Mar 01 17:46:03 2010 +0900 +++ b/Settings.class.php Mon Mar 01 20:51:36 2010 +0900 @@ -2,17 +2,17 @@ include_once('config.php'); class Settings extends SimpleXMLElement { - + const CONFIG_XML = "/settings/config.xml"; - + public static function factory() { - + if( file_exists( INSTALL_PATH . self::CONFIG_XML ) ) { $xmlfile = file_get_contents(INSTALL_PATH . self::CONFIG_XML); $obj = new self($xmlfile); - + // 8月14日以降に追加した設定項目の自動生成 - + // キーワード自動録画の録画モード if( $obj->exists("autorec_mode") == 0 ) { $obj->autorec_mode = 0; @@ -29,86 +29,86 @@ // 初回起動 $xmlfile = ''; $xml = new self($xmlfile); - + // 旧config.phpを読み取って設定 if(defined("SPOOL") ) $xml->spool = SPOOL; else $xml->spool = "/video"; - + if(defined("THUMBS") ) $xml->thumbs = THUMBS; else $xml->thumbs = "/thumbs"; - + if(defined("INSTALL_URL")) $xml->install_url = INSTALL_URL; else $xml->install_url = "http://localhost/epgrec"; - + if(defined("BS_TUNERS")) $xml->bs_tuners = BS_TUNERS; else $xml->bs_tuners = 0; - + if(defined("GR_TUNERS")) $xml->gr_tuners = GR_TUNERS; else $xml->gr_tuners = 1; if(defined("CS_REC_FLG")) $xml->cs_rec_flg = CS_REC_FLG; else $xml->cs_rec_flg = 0; - + if(defined("USE_KUROBON")) $xml->use_kurobon = USE_KUROBON ? 1 : 0; else $xml->use_kurobon = 0; - + if(defined("FORMER_TIME")) $xml->former_time = FORMER_TIME; else $xml->former_time = 20; - + if(defined("EXTRA_TIME")) $xml->extra_time = EXTRA_TIME; else $xml->extra_time = 0; - + if(defined("FORCE_CONT_REC")) $xml->force_cont_rec = FORCE_CONT_REC ? 1 : 0; else $xml->force_cont_rec = 0; - + if(defined("REC_SWITCH_TIME")) $xml->rec_switch_time = REC_SWITCH_TIME; else $xml->rec_switch_time = 5; - + if(defined("USE_THUMBS")) $xml->use_thumbs = USE_THUMBS ? 1 : 0; else $xml->use_thumbs = 0; - + if(defined("MEDIATOMB_UPDATE")) $xml->mediatomb_update = MEDIATOMB_UPDATE ? 1 : 0; else $xml->mediatomb_update = 0; - + if(defined("FILENAME_FORMAT")) $xml->filename_format = FILENAME_FORMAT; else $xml->filename_format = "%TYPE%%CH%_%ST%_%ET%"; - + if(defined("DB_HOST")) $xml->db_host = DB_HOST; else $xml->db_host = "localhost"; - + if(defined("DB_NAME")) $xml->db_name = DB_NAME; else $xml->db_name = "yourdbname"; - + if(defined("DB_USER")) $xml->db_user = DB_USER; else $xml->db_user = "yourname"; - + if(defined("DB_PASS")) $xml->db_pass = DB_PASS; else $xml->db_pass = "yourpass"; - + if(defined("TBL_PREFIX")) $xml->tbl_prefix = TBL_PREFIX; else $xml->tbl_prefix = "Recorder_"; if(defined("EPGDUMP")) $xml->epgdump = EPGDUMP; else $xml->epgdump = "/usr/local/bin/epgdump"; - + if(defined("AT")) $xml->at = AT; else $xml->at = "/usr/bin/at"; - + if(defined( "ATRM" )) $xml->atrm = ATRM; else $xml->atrm = "/usr/bin/atrm"; if(defined( "SLEEP" )) $xml->sleep = SLEEP; else $xml->sleep = "/bin/sleep"; - + if(defined( "FFMPEG" )) $xml->ffmpeg = FFMPEG; else $xml->ffmpeg = "/usr/bin/ffmpeg"; - + if(defined("TEMP_DATA" )) $xml->temp_data = TEMP_DATA; else $xml->temp_data = "/tmp/__temp.ts"; - + if(defined("TEMP_XML")) $xml->temp_xml = TEMP_XML; else $xml->temp_xml = "/tmp/__temp.xml"; - + // index.phpで使う設定値 // 表示する番組表の長さ（時間） $xml->program_length = 8; @@ -116,33 +116,33 @@ $xml->ch_set_width = 150; // 1分あたりの高さ $xml->height_per_hour = 120; - + // 8月14日版以降に追加した設定項目 - + // キーワード自動録画の録画モード $xml->autorec_mode = 0; - + $xml->save(); - + return $xml; } } - + public function exists( $property ) { return (int)count( $this->{$property} ); } - + public function post() { global $_POST; - + foreach( $_POST as $key => $value ) { - + if( $this->exists($key) ) { $this->{$key} = trim($value); } } } - + public function save() { $this->asXML(INSTALL_PATH . self::CONFIG_XML); } diff -r c29d41d0c945 -r 36ac7c416bd7 do-record.sh.pt1 --- a/do-record.sh.pt1 Mon Mar 01 17:46:03 2010 +0900 +++ b/do-record.sh.pt1 Mon Mar 01 20:51:36 2010 +0900 @@ -8,4 +8,18 @@ RECORDER=/usr/local/bin/recpt1 -$RECORDER --b25 --strip $CHANNEL $DURATION ${OUTPUT} >/dev/null +case $CHANNEL in + 101|102|191|192|193) SID=$CHANNEL ;; + *) SID="HD" ;; +esac + +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 +elif [ ${MODE} == 2 ]; then + $RECORDER $CHANNEL $DURATION ${OUTPUT}.tmp.ts --b25 --strip + ffmpeg -i ${OUTPUT}.tmp.ts ... Ŭʥץ ${OUTPUT} +fi diff -r c29d41d0c945 -r 36ac7c416bd7 getepg.php --- a/getepg.php Mon Mar 01 17:46:03 2010 +0900 +++ b/getepg.php Mon Mar 01 20:51:36 2010 +0900 @@ -38,7 +38,8 @@ 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 ) { //xxx +// if( ($num == 0) && check_file($temp_xml_bs) ) { //orig $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; @@ -72,13 +73,14 @@ } } } - + // 地上波を処理する 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 ) { //xxx +// if( ($num == 0) && 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.""; @@ -90,4 +92,4 @@ } } -?> \ No newline at end of file +?> diff -r c29d41d0c945 -r 36ac7c416bd7 simpleReservation.php --- a/simpleReservation.php Mon Mar 01 17:46:03 2010 +0900 +++ b/simpleReservation.php Mon Mar 01 20:51:36 2010 +0900 @@ -11,9 +11,9 @@ $settings = Settings::factory(); try { - Reservation::simple( $program_id , 0, $settings->autorec_mode); + Reservation::simple( $program_id, 0, $settings->autorec_mode); } catch( Exception $e ) { exit( "Error:". $e->getMessage() ); } -?> \ No newline at end of file +?>