Author: duncan
Date: Wed Oct 25 07:15:14 2006
New Revision: 8473
Modified:
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/RELEASE_NOTES
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/plugins/autoshutdown.py
Log:
Merged changes from rel-1-6
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Wed Oct 25 07:15:14 2006
@@ -24,6 +24,7 @@
---------------------------
* New events to allow jump directly to menus, tv, movies, music and pictures
(B#1567501)
+ * New headlines and idlebar are enabled by default (F#1584197)
* New multi-tuner support, to allow use of more than one tv card (F#1574282)
* New plug-in for wakeup and shutdown (B#1567885)
* New plug-in 'idlebar.diskfree' to show the available recording disk space
(B#1567491)
Modified: branches/rel-1/freevo/RELEASE_NOTES
==============================================================================
--- branches/rel-1/freevo/RELEASE_NOTES (original)
+++ branches/rel-1/freevo/RELEASE_NOTES Wed Oct 25 07:15:14 2006
@@ -24,9 +24,8 @@
--------------
If a directory is name with a media extension it will be treated as a
-media file, e.g. music.mp3 or record.avi.
-
-If webradio is activated it will appear twice in the music menu.
+media file, e.g. music.mp3 or record.avi. Use music_mp3 and record_avi
+instead.
If a mp3 file is incorrectly named the header search will scan the whole
file, e.g. something.mp3 which is really a wave file.
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Wed Oct 25 07:15:14 2006
@@ -713,12 +713,21 @@
# plugin.activate('joy')
# ======================================================================
+# Idlebar and plugins
+# ======================================================================
+plugin.activate('idlebar')
+plugin.activate('idlebar.tv', level = 20)
+plugin.activate('idlebar.cdstatus', level = 25)
+plugin.activate('idlebar.diskfree', level = 30)
+plugin.activate('idlebar.clock', level = 50, args='%a %d %H:%M')
+
+# ======================================================================
# Headlines
# ======================================================================
-#plugin.activate('headlines', level=45)
+plugin.activate('headlines', level=45)
HEADLINES_LOCATIONS = [
('Freevo news releases',
'http://sourceforge.net/export/rss2_projnews.php?group_id=46652'),
- ('Freevo news releases (full)',
'http://sourceforge.net/export/rss2_projnews.php?group_id=46652&rss_fulltext=1'),
+ #('Freevo news releases (full)',
'http://sourceforge.net/export/rss2_projnews.php?group_id=46652&rss_fulltext=1'),
('Freevo file releases',
'http://sourceforge.net/export/rss2_projfiles.php?group_id=46652'),
('Freevo summary+stats',
'http://sourceforge.net/export/rss2_projsummary.php?group_id=46652'),
('Freevo donors',
'http://sourceforge.net/export/rss2_projdonors.php?group_id=46652'),
Modified: branches/rel-1/freevo/src/plugins/autoshutdown.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/autoshutdown.py (original)
+++ branches/rel-1/freevo/src/plugins/autoshutdown.py Wed Oct 25 07:15:14 2006
@@ -89,7 +89,8 @@
The wakeup methode can be either nvram or acpi.
NVRAM:
- If you want to use nvram-wakeup, you will need a working nvram
configuration first.
+ If you want to use nvram-wakeup,
+ you will need a working nvram configuration first.
(This plugin can deal automatically with the often needed reboot).
Put the path to nvram-wakeup in AUTOSHUTDOWN_WAKEUP_CMD.
@@ -520,25 +521,8 @@
else:
next_action = Shutdown.IGNORE
else:
- # we must take in consideration the TV_RECORD_PADDING_PRE here,
- # otherwise we are to late for the recording
-
- # try if the user configured some paddings
- try:
- pre_padding = config.TV_RECORD_PADDING_PRE
- except:
- pre_padding = 0
- try:
- padding = config.TV_RECORD_PADDING
- except:
- padding = 0
- # take the longer padding
- if pre_padding < padding:
- pre_padding = padding
- # and substract it from the next wakeup time
- wakeup_utc_s = wakeup_utc_s - pre_padding
-
- # we should wake up even earlier because of the time the booting takes
+
+ # wake up a little earlier because of the time the booting takes
# 180 s = 3 min should be enough
wakeup_utc_s = wakeup_utc_s - 180
@@ -558,13 +542,14 @@
if config.AUTOSHUTDOWN_BOOT_LOADER.upper() == "GRUB":
if config.AUTOSHUTDOWN_REMOUNT_BOOT_CMD:
cmd = "%s %s" % (config.AUTOSHUTDOWN_REMOUNT_BOOT_CMD,
\
- config.AUTOSHUTDOWN_REMOUNT_BOOT_OPT)
+ config.AUTOSHUTDOWN_REMOUNT_BOOT_OPT)
cmd = config.AUTOSHUTDOWN_GRUB_CMD
__syscall(cmd)
_debug_("Wakeup set, reboot needed")
next_action = Shutdown.RESTART_SYSTEM
elif config.AUTOSHUTDOWN_BOOT_LOADER.upper() == "LILO":
- cmd = "%s %s" % (config.AUTOSHUTDOWN_LILO_CMD,
config.AUTOSHUTDOWN_LILO_OPT)
+ cmd = "%s %s" % (config.AUTOSHUTDOWN_LILO_CMD, \
+ config.AUTOSHUTDOWN_LILO_OPT)
__syscall(cmd)
_debug_("Wakeup set, reboot needed")
next_action = Shutdown.RESTART_SYSTEM
@@ -629,7 +614,7 @@
# -----------------------------------------------------------
def __get_scheduled_recording(index):
try:
- (result, response) = record_client.updateFavoritesSchedule()
+ #(result, response) = record_client.updateFavoritesSchedule()
(result, schedule) = record_client.getScheduledRecordings()
except:
raise ExNoRecordServer
@@ -643,10 +628,28 @@
f = lambda a, b: cmp(a.start, b.start)
proglist.sort(f)
wakeup = proglist[index].start
- print wakeup
- _debug_("Scheduled recording %d at %s is %s" % (index,
time.ctime(wakeup), proglist[index]))
+ _debug_("Scheduled recording %d at %s is %s" % (index, \
+ time.ctime(wakeup), proglist[index]))
else:
raise ExIndexNotAvailable
+
+ # we must take in consideration the TV_RECORD_PADDING_PRE here,
+ # otherwise we are to late for the recording
+
+ # try if the user configured some paddings
+ try:
+ pre_padding = config.TV_RECORD_PADDING_PRE
+ except:
+ pre_padding = 0
+ try:
+ padding = config.TV_RECORD_PADDING
+ except:
+ padding = 0
+ # take the longer padding
+ if pre_padding < padding:
+ pre_padding = padding
+ # and substract it from the next wakeup time
+ wakeup = wakeup - pre_padding
return wakeup
@@ -703,7 +706,7 @@
else:
delimiter='|'
searchstring = delimiter.join(config.AUTOSHUTDOWN_PROCESS_LIST)
- cmd = 'ps -ef | egrep -v "grep" | egrep ":?? (%s)"' % searchstring
+ cmd = 'ps -eo cmd | egrep -v "grep" | egrep
"(/|[[:space:]]|^)(%s)($|[[:space:]])"' % searchstring
result = __syscall(cmd)
if (result == 0):
_debug_('external process(es) running')
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
