Revision: 5677 Author: pebender Date: Wed Oct 14 13:35:45 2009 Log: - Added MM_HULU_STORE_HULUDESKTOP_DATA.
http://code.google.com/p/minimyth/source/detail?r=5677 Added: /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/usr/bin/mm_hulu Modified: /trunk/gar-minimyth/html/minimyth/document-changelog.txt /trunk/gar-minimyth/html/minimyth/document-configure.html /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HULU.pm /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm /trunk/gar-minimyth/script/minimyth.conf.mk /trunk/gar-minimyth/script/myth-0.20/mythtv/checksums /trunk/gar-minimyth/script/myth-0.20/mythtv/files/mythtv-0.20-hulu.patch /trunk/gar-minimyth/script/myth-0.20-softpad/mythtv/checksums /trunk/gar-minimyth/script/myth-0.20-softpad/mythtv/files/mythtv-0.20-hulu.patch /trunk/gar-minimyth/script/myth-0.21/mythtv/checksums /trunk/gar-minimyth/script/myth-0.21/mythtv/files/mythtv-0.21-hulu.patch /trunk/gar-minimyth/script/myth-0.22/mythtv/checksums /trunk/gar-minimyth/script/myth-0.22/mythtv/files/mythtv-0.22-hulu.patch /trunk/gar-minimyth/script/myth-trunk/mythtv/checksums /trunk/gar-minimyth/script/myth-trunk/mythtv/files/mythtv-trunk-hulu.patch ======================================= --- /dev/null +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/usr/bin/mm_hulu Wed Oct 14 13:35:45 2009 @@ -0,0 +1,21 @@ +#!/usr/bin/perl + +use strict; +use warnings; + +use MiniMyth (); + +my $minimyth = new MiniMyth; +$minimyth->var_load(); + +system('/usr/bin/huludesktop'); + +if ($minimyth->var_get('MM_HULU_STORE_HULUDESKTOP_DATA') eq 'yes') +{ + if (-e '/home/minimyth/.local/share/.huludesktop.data') + { + $minimyth->confrw_put('huludesktop.data', '/home/minimyth/.local/share/.huludesktop.data'); + } +} + +1; ======================================= --- /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Oct 14 08:57:05 2009 +++ /trunk/gar-minimyth/html/minimyth/document-changelog.txt Wed Oct 14 13:35:45 2009 @@ -22,7 +22,7 @@ - The Hulu Desktop is similar to the binary codecs and Adobe Flash Player. It is not included in the image, but it can be fetched and saved using the MiniMyth Tools menu. - - Added MM_HULU_URL and MM_HULU_REMOTE. + - Added MM_HULU_URL, MM_HULU_REMOTE and MM_HULU_STORE_HULUDESKTOP_DATA. - Added MM_DHCP_ADDRESS, MM_DHCP_BROADCAST, MM_DHCP_SUBNET_MASK, and MM_DHCP_ROUTERS for statically configuring network the interface. - Removed auto-detection of sensor chip on ASUS motherboards as ASUS ======================================= --- /trunk/gar-minimyth/html/minimyth/document-configure.html Sun Sep 20 18:33:25 2009 +++ /trunk/gar-minimyth/html/minimyth/document-configure.html Wed Oct 14 13:35:45 2009 @@ -704,6 +704,24 @@ Therefore, when using network boot, do not allow anything identifying itself using these credentials to do anything that could be harmful. </p> + </dd> + </dl> + <dl> + <dt id="huludesktop_data">huludesktop.data</dt> + <dd> + <p> + The Hulu Desktop configuration file. + MiniMyth will use this file as the '/home/minimyth/.local/share/.huludesktop.data' file in the MiniMyth file system. + Whether or not 'huludesktop.data' is saved and retrieved depends on + '<a href="document-minimyth_conf.html#MM_HULU_STORE_HULUDESKTOP_DATA">MM_HULU_STORE_HULUDESKTOP_DATA</a>'. + </p> + <p> + This file contains a subset of the Hulu Desktop configuration information. + It contains the system independent information. + For example, it contains the Hulu Desktop state and user profile settings. + It does not contain system dependent information. + For example, it does not contain application window size and location, Adobe Flash Player location or remote control type. + </p> </dd> </dl> <dl> @@ -884,7 +902,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-09-20 + Last Updated on 2009-10-14 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Sun Oct 11 08:34:23 2009 +++ /trunk/gar-minimyth/html/minimyth/document-minimyth_conf.html Wed Oct 14 13:35:45 2009 @@ -1863,6 +1863,7 @@ <ul> <li><a href="#MM_HULU_URL">MM_HULU_URL</a></li> <li><a href="#MM_HULU_REMOTE">MM_HULU_REMOTE</a></li> + <li><a href="#MM_HULU_STORE_HULUDESKTOP_DATA">MM_HULU_STORE_HULUDESKTOP_DATA</a></li> </ul> <dl> <dt id="MM_HULU-overview"><strong>Overview</strong></dt> @@ -1890,7 +1891,8 @@ '/usr/bin/huludesktop'. </p> <p> - If the value is 'auto', + If the value is 'auto' and + <a href="MM_FLASH_URL">'MM_FLASH_URL'</a> is not 'none', then MiniMyth will assume that the file is an executable file located in the MiniMyth read-write configuration directory and having the name 'huludesktop.{arch}', where {arch} is 32 or 64. @@ -1925,19 +1927,39 @@ </dd> <dt id="MM_HULU_REMOTE"><strong>MM_HULU_REMOTE</strong></dt> <dd> - Set the name of the remote control that Hulu will use. - Valid values are remote control name with, 'mceusb' the default. + <p> + Set the name of the remote control that Hulu will use. + Valid values are remote control name with, 'mceusb' the default. + </p> + <p> + For some reason, Hulu Desktop requires the name of the remote control. + It ignores remote control input that is not from the named remote control. + </p> + <p> + In order to determine the name of your remote control, + telnet into your MiniMyth system, + run the command 'irw' and + press a key on your remote control. + The name of your remote control is the word at the end of each line output by 'irw' + </p> </dd> + <dt id="MM_HULU_STORE_HULUDESKTOP_DATA"><strong>MM_HULU_STORE_HULUDESKTOP_DATA</strong></dt> <dd> - For some reason, Hulu Desktop requires the name of the remote control. - It ignores remote control input that is not from the named remote control. - </dd> - <dd> - In order to determine the name of your remote control, - telnet into your MiniMyth system, - run the command 'irw' and - press a key on your remote control. - The name of your remote control is the word at the end of each line output by 'irw' + <p> + Indicate whether or not to store and fetch the + '<a href="document-configure.html#huludesktop_data">huludesktop.data</a>' + file to and from the MiniMyth system's MiniMyth read-write configuration directory. + Valid values are 'yes' and 'no', + with 'no' the default when <a href="#MM_HULU_URL">MM_HULU_URL</a> is 'none' + and '/usr/bin/huludesktop' does not exist, + and 'yes' the default otherwise. + </p> + <p> + If MM_HULU_STORE_HULUDESKTOP_DATA='yes', + then MiniMyth will fetch this file on boot and store this file whenever the 'mm_hulu' command exits. + Therefore, if you want MiniMyth to store your Hulu Desktop configuration file, + then you must run Hulu Desktop using the 'mm_hulu' command rather than the 'huludesktop' command. + </p> </dd> </dl> <p> @@ -3415,7 +3437,7 @@ alt="Valid CSS!" height="31" width="88" /></a> </div> <div class="version"> - Last Updated on 2009-10-11 + Last Updated on 2009-10-14 <br /> < mailto : webmaster at minimyth dot org > </div> ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HULU.pm Sat Oct 10 07:07:10 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf/MM_HULU.pm Wed Oct 14 13:35:45 2009 @@ -15,7 +15,7 @@ $var_list{'MM_HULU_URL'} = { - prerequisite => ['MM_FLASH'], + prerequisite => ['MM_FLASH_URL'], value_default => 'auto', value_valid => 'auto|none|((cifs|confro|confrw|dist|file|http|hunt| nfs| tftp):(//(([^:@]*)?(:([...@]*))?\@)?([^/]+))?[^?#]*(\?([^#]*))?(\#(.*))?)', value_auto => sub @@ -49,4 +49,33 @@ value_none => '' }; +$var_list{'MM_HULU_STORE_HULUDESKTOP_DATA'} = +{ + prerequisite => ['MM_HULU_URL'], + value_default => sub + { + my $minimyth = shift; + my $name = shift; + + my $value_default = 'no'; + + if ($minimyth->var_get('MM_HULU_URL') ne '') + { + $value_default = 'yes'; + } + + if (-e '/usr/bin/huludesktop') + { + $value_default = 'yes'; + } + + return $value_default; + }, + value_valid => 'no|yes', + value_file => 'yes', + file => {name_remote => '/huludesktop.data', + mode_remote => 'rw', + name_local => '/home/minimyth/.local/share/.huludesktop.data'} +}; + 1; ======================================= --- /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm Thu May 21 16:29:03 2009 +++ /trunk/gar-minimyth/script/meta/minimyth/files/source/rootfs/etc/rc.d/init/conf.pm Wed Oct 14 13:35:45 2009 @@ -626,6 +626,7 @@ foreach (@{$file}) { my $name_remote = $_->{'name_remote'}; + my $mode_remote = $_->{'mode_remote'} || 'ro'; my $name_local = $_->{'name_local'}; my $mode_local = $_->{'mode_local'} || '0644' ; @@ -633,18 +634,37 @@ { File::Path::rmtree($name_local); } - my $result = $minimyth->confro_get($name_remote, $name_local); - if (! -e $name_local) - { - $minimyth->message_output('err', qq(failed to fetch MiniMyth read-only configuration file ') . $name_remote . qq(')); - $success = 0; - } - else - { - $minimyth->message_log('info', qq(fetched MiniMyth read-only configuration file ') . $name_remote . qq(')); - $minimyth->message_log('info', qq( by fetching ') . $result . qq(')); - $minimyth->message_log('info', qq( to local file ') . $name_local . qq('.)); - chmod(oct($mode_local), $name_local); + if ($mode_remote eq 'ro') + { + my $result = $minimyth->confro_get($name_remote, $name_local); + if (! -e $name_local) + { + $minimyth->message_output('err', qq(failed to fetch MiniMyth read-only configuration file ') . $name_remote . qq(')); + $success = 0; + } + else + { + $minimyth->message_log('info', qq(fetched MiniMyth read-only configuration file ') . $name_remote . qq(')); + $minimyth->message_log('info', qq( by fetching ') . $result . qq(')); + $minimyth->message_log('info', qq( to local file ') . $name_local . qq('.)); + chmod(oct($mode_local), $name_local); + } + } + if ($mode_remote eq 'rw') + { + my $result = $minimyth->confrw_get($name_remote, $name_local); + if (! -e $name_local) + { + $minimyth->message_output('err', qq(failed to fetch MiniMyth read-write configuration file ') . $name_remote . qq(')); + $success = 0; + } + else + { + $minimyth->message_log('info', qq(fetched MiniMyth read-write configuration file ') . $name_remote . qq(')); + $minimyth->message_log('info', qq( by fetching ') . $result . qq(')); + $minimyth->message_log('info', qq( to local file ') . $name_local . qq('.)); + chmod(oct($mode_local), $name_local); + } } } } ======================================= --- /trunk/gar-minimyth/script/minimyth.conf.mk Tue Oct 13 17:33:09 2009 +++ /trunk/gar-minimyth/script/minimyth.conf.mk Wed Oct 14 13:35:45 2009 @@ -19,7 +19,7 @@ ) # Configuration file (minimyth.conf) version. -mm_CONF_VERSION ?= 48 +mm_CONF_VERSION ?= 49 #------------------------------------------------------------------------------- # Variables that you are likely to be override based on your environment. ======================================= --- /trunk/gar-minimyth/script/myth-0.20/mythtv/checksums Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/myth-0.20/mythtv/checksums Wed Oct 14 13:35:45 2009 @@ -9,7 +9,7 @@ 5f74363e01cc0417089e8762bad48b33 download/mythtv-0.20-gcc_4.4.patch 5984ec3696c8eb4a7c0ce4bd3cb72e8e download/mythtv-0.20-link_xvmc_lib.patch 7f41a7d92d1fb7acab2676a633a03178 download/mythtv-0.20-mythstream.patch -1091b119c82deefe8595e50d0d8c5f48 download/mythtv-0.20-hulu.patch +64738c8683c1cb7f8ffe5536540b2c15 download/mythtv-0.20-hulu.patch 6e51c985ef96e16a50117c192e461773 download/mythtv-0.20-networkcontrol.patch 9a25dde95778e63d987a3c3c7e9a75f7 download/mythtv-0.20-eject.patch aa6cc37f6bbc2f2a78f36005a8f58ad7 download/mythtv-0.20-udevinfo.patch ======================================= --- /trunk/gar-minimyth/script/myth-0.20/mythtv/files/mythtv-0.20-hulu.patch Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/myth-0.20/mythtv/files/mythtv-0.20-hulu.patch Wed Oct 14 13:35:45 2009 @@ -7,7 +7,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> @@ -23,7 +23,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> ======================================= --- /trunk/gar-minimyth/script/myth-0.20-softpad/mythtv/checksums Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/myth-0.20-softpad/mythtv/checksums Wed Oct 14 13:35:45 2009 @@ -8,7 +8,7 @@ 47440d9e7703baf7dc1db365334fb885 download/mythtv-0.20-gcc_4.3.patch 5f74363e01cc0417089e8762bad48b33 download/mythtv-0.20-gcc_4.4.patch 41aae06d3068469fed104c1cf7da278d download/mythtv-0.20-link_xvmc_lib.patch -1091b119c82deefe8595e50d0d8c5f48 download/mythtv-0.20-hulu.patch +64738c8683c1cb7f8ffe5536540b2c15 download/mythtv-0.20-hulu.patch 7f41a7d92d1fb7acab2676a633a03178 download/mythtv-0.20-mythstream.patch 4c244ef681fdf8d76c1c6d55bad9b038 download/mythtv-0.20-networkcontrol.patch 0847e4ebdf7ae63d7ca049411a5a0061 download/mythtv-0.20-eject.patch ======================================= --- /trunk/gar-minimyth/script/myth-0.20-softpad/mythtv/files/mythtv-0.20-hulu.patch Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/myth-0.20-softpad/mythtv/files/mythtv-0.20-hulu.patch Wed Oct 14 13:35:45 2009 @@ -7,7 +7,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> @@ -23,7 +23,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> ======================================= --- /trunk/gar-minimyth/script/myth-0.21/mythtv/checksums Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/myth-0.21/mythtv/checksums Wed Oct 14 13:35:45 2009 @@ -6,7 +6,7 @@ 90ec22c573787820c0eba5c6fdc95213 download/mythtv-0.21-glvdpau20744.patch ed55c3736486dfac39de23ab813547f2 download/mythtv-0.21-ticket-4792.patch ac75a545f124c7ce0b001c6c1868bf3c download/mythtv-0.21-ticket-5487.patch -f92402a13d46149e2b61672268d59966 download/mythtv-0.21-hulu.patch +7f132dcb9ba5909fa2415e0acbcc5044 download/mythtv-0.21-hulu.patch d997e8d2ed3939152bf9bc768f054d42 download/mythtv-0.21-networkcontrol.patch 000b713185be2fcf7658e5348a45c83f download/mythtv-0.21-eject.patch 34dd6b9f67075bcaf3569549365fe187 download/mythtv-0.21-udevinfo.patch ======================================= --- /trunk/gar-minimyth/script/myth-0.21/mythtv/files/mythtv-0.21-hulu.patch Fri Oct 9 13:44:36 2009 +++ /trunk/gar-minimyth/script/myth-0.21/mythtv/files/mythtv-0.21-hulu.patch Wed Oct 14 13:35:45 2009 @@ -7,7 +7,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> @@ -23,7 +23,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> ======================================= --- /trunk/gar-minimyth/script/myth-0.22/mythtv/checksums Tue Oct 13 17:33:09 2009 +++ /trunk/gar-minimyth/script/myth-0.22/mythtv/checksums Wed Oct 14 13:35:45 2009 @@ -1,7 +1,7 @@ be87cb2533cb9f5002064fe8b72ad304 download/mythtv-0.22-sysroot.patch 02d4fab0a9af34237937a5217de5b5fc download/mythtv-0.22-dvdnav_shared.patch a871e5a1fab1d879cc72a1cc0a4184f5 download/mythtv-0.22-fftw3f.patch -f96a1c2b721f6c106f5f298e2543a603 download/mythtv-0.22-hulu.patch +c2abe6bd43e2ce3b28cfd33ec4606982 download/mythtv-0.22-hulu.patch 18a177f149f194b358a968254ed49c70 download/mythtv-0.22-networkcontrol.patch 82d1387b0ea693fbeca13c7bf0023c81 download/mythtv-0.22-eject.patch 50dfff1a4b26ec5fc4ca21c0e83fc022 download/mythtv-0.22-udevinfo.patch ======================================= --- /trunk/gar-minimyth/script/myth-0.22/mythtv/files/mythtv-0.22-hulu.patch Tue Oct 13 17:33:09 2009 +++ /trunk/gar-minimyth/script/myth-0.22/mythtv/files/mythtv-0.22-hulu.patch Wed Oct 14 13:35:45 2009 @@ -7,7 +7,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> @@ -23,7 +23,7 @@ <button> + <type>STREAM</type> + <text>Play Online Streams</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythtv/checksums Tue Oct 13 17:33:09 2009 +++ /trunk/gar-minimyth/script/myth-trunk/mythtv/checksums Wed Oct 14 13:35:45 2009 @@ -1,7 +1,7 @@ dea75858be14035e77e63d8442f97415 download/mythtv-trunk-sysroot.patch 1310184f38b756c50462a5cfa828b8ca download/mythtv-trunk-dvdnav_shared.patch 7717065e4794def72c37893e020ae47e download/mythtv-trunk-fftw3f.patch -fa625eb785dfe451b241cb1b37b46227 download/mythtv-trunk-hulu.patch +a228e2658179ed96efc848c8409d02ba download/mythtv-trunk-hulu.patch 146ed6bd116f3a16a74da959b050dd15 download/mythtv-trunk-networkcontrol.patch a56fcf7532c6062c8a016cd8a9b86913 download/mythtv-trunk-eject.patch 1143d660904ec5db8cabae0070fcd355 download/mythtv-trunk-udevinfo.patch ======================================= --- /trunk/gar-minimyth/script/myth-trunk/mythtv/files/mythtv-trunk-hulu.patch Tue Oct 13 17:33:09 2009 +++ /trunk/gar-minimyth/script/myth-trunk/mythtv/files/mythtv-trunk-hulu.patch Wed Oct 14 13:35:45 2009 @@ -7,7 +7,7 @@ <button> + <type>HULU</type> + <text>Watch Hulu</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> @@ -23,7 +23,7 @@ <button> + <type>STREAM</type> + <text>Play Online Streams</text> -+ <action>EXEC /usr/bin/huludesktop</action> ++ <action>EXEC /usr/bin/mm_hulu</action> + </button> + + <button> --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "minimyth-commits" group. To post to this group, send email to [email protected] To unsubscribe from this group, send email to [email protected] For more options, visit this group at http://groups.google.com/group/minimyth-commits?hl=en -~----------~----~----~----~------~----~------~--~---
