Author: duncan
Date: Tue Aug 7 16:28:42 2007
New Revision: 9805
Log:
Changed the way that freevo creates it's directories
Replaced LOGDIR with FREEVO_LOGDIR
Modified:
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/audio/plugins/xmradio.py
branches/rel-1/freevo/src/childapp.py
branches/rel-1/freevo/src/config.py
branches/rel-1/freevo/src/helpers/commdetectserver.py
branches/rel-1/freevo/src/helpers/encodingserver.py
branches/rel-1/freevo/src/helpers/recordserver.py
branches/rel-1/freevo/src/helpers/rssserver.py
branches/rel-1/freevo/src/helpers/webserver.py
branches/rel-1/freevo/src/main.py
branches/rel-1/freevo/src/plugins/cd_burn.py
branches/rel-1/freevo/src/plugins/command.py
branches/rel-1/freevo/src/rssperiodic.py
branches/rel-1/freevo/src/tv/plugins/generic_record.py
branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Tue Aug 7 16:28:42 2007
@@ -288,7 +288,8 @@
Added CACHE_CROPDETECT to enable caching of crop detection using
encodingcode
''' ),
(5.21,
- '''Items for release-1.7.4
+ '''Added OS_STATICDIR
+ Change static data to use /var/lib/freevo or ~/.freevo
'''),
]
@@ -602,10 +603,11 @@
# old MOVIE_DATA_DIR if you have one. It needs to be set to a directory
# Freevo can write to.
#
-if os.environ.has_key('HOME') and os.environ['HOME']:
- OVERLAY_DIR = os.path.join(os.environ['HOME'], '.freevo/vfs')
-else:
- OVERLAY_DIR = os.path.join(FREEVO_CACHEDIR, 'vfs')
+#if os.environ.has_key('HOME') and os.environ['HOME']:
+# OVERLAY_DIR = os.path.join(os.environ['HOME'], '.freevo/vfs')
+#else:
+# OVERLAY_DIR = os.path.join(FREEVO_CACHEDIR, 'vfs')
+OVERLAY_DIR = os.path.join(FREEVO_CACHEDIR, 'vfs')
#
# Umask setting for all files.
@@ -1961,9 +1963,9 @@
# This is the XMLTV file that can be optionally used for TV listings
#
if os.uname()[0] == 'FreeBSD':
- XMLTV_FILE = OS_CACHEDIR + '/xmltv/TV.xml'
+ XMLTV_FILE = FREEVO_CACHEDIR + '/TV.xml'
else:
- XMLTV_FILE = '/tmp/TV.xml'
+ XMLTV_FILE = FREEVO_STATICDIR + '/TV.xml'
#
# XML TV Logo Location
@@ -1971,7 +1973,7 @@
# Use the "makelogos.py" script to download all the
# Station logos into a directory. And then put the path
# to those logos here
-TV_LOGOS = OS_CACHEDIR + '/xmltv/logos'
+TV_LOGOS = FREEVO_STATICDIR + '/logos'
if not os.path.isdir(TV_LOGOS):
os.makedirs(TV_LOGOS)
Modified: branches/rel-1/freevo/src/audio/plugins/xmradio.py
==============================================================================
--- branches/rel-1/freevo/src/audio/plugins/xmradio.py (original)
+++ branches/rel-1/freevo/src/audio/plugins/xmradio.py Tue Aug 7 16:28:42 2007
@@ -103,17 +103,17 @@
def create_channels_menu(self, arg=None, menuw=None):
- string='rm -f /%s/xmonline.cookies'%config.LOGDIR
+ string='rm -f /%s/xmonline.cookies'%config.FREEVO_LOGDIR
os.system(string)
string=('curl -s -c /%s/xmonline.cookies -d "user_id=%s" -d "pword=%s"
\
"http://xmro.xmradio.com/xstream/login_servlet.jsp"; >
/%s/xmonlinelogin.out' \
- % (config.LOGDIR, config.XM_USER, config.XM_PASS,
config.LOGDIR))
+ % (config.FREEVO_LOGDIR, config.XM_USER, config.XM_PASS,
config.FREEVO_LOGDIR))
os.system(string)
channel_items = []
for rchannel in config.XM_STATIONS:
- string='rm -f /%s/xmonlinechannel.out'%config.LOGDIR
+ string='rm -f /%s/xmonlinechannel.out'%config.FREEVO_LOGDIR
os.system(string)
string=('curl -s \
@@ -121,9 +121,9 @@
-d "" \
"http://player.xmradio.com/player/2ft/playMedia.jsp?ch=%s&speed=%s"; \
> /%s/xmonlinestream.out' \
- % (config.LOGDIR,rchannel[1],config.XM_RATE,config.LOGDIR))
+ %
(config.FREEVO_LOGDIR,rchannel[1],config.XM_RATE,config.FREEVO_LOGDIR))
os.system(string)
- file = open('/%s/xmonlinestream.out'%config.LOGDIR,'r')
+ file = open('/%s/xmonlinestream.out'%config.FREEVO_LOGDIR,'r')
text = file.readlines()
file.close()
for line in text:
Modified: branches/rel-1/freevo/src/childapp.py
==============================================================================
--- branches/rel-1/freevo/src/childapp.py (original)
+++ branches/rel-1/freevo/src/childapp.py Tue Aug 7 16:28:42 2007
@@ -109,14 +109,14 @@
if doeslogging or config.CHILDAPP_DEBUG:
doeslogging = 1
- stdout_logger = os.path.join(config.LOGDIR, '%s-stdout-%s.log' %
(debug_name, os.getuid()))
+ stdout_logger = os.path.join(config.FREEVO_LOGDIR, '%s-stdout-%s.log'
% (debug_name, os.getuid()))
try:
self.stdout_log = doeslogging and open(stdout_logger, 'w') or None
except OSError, e:
_debug_('Cannot open "%s": %s' % (stdout_logger, e),
config.DWARNING)
self.stdout_log = None
- stderr_logger = os.path.join(config.LOGDIR, '%s-stderr-%s.log' %
(debug_name, os.getuid()))
+ stderr_logger = os.path.join(config.FREEVO_LOGDIR, '%s-stderr-%s.log'
% (debug_name, os.getuid()))
try:
self.stderr_log = doeslogging and open(stderr_logger, 'w') or None
except OSError, e:
@@ -401,7 +401,7 @@
self.callback = callback
self.logger = None
if logger and doeslogging:
- logger = os.path.join(config.LOGDIR, '%s-%s-%s.log' % (logger,
name, os.getuid()))
+ logger = os.path.join(config.FREEVO_LOGDIR, '%s-%s-%s.log' %
(logger, name, os.getuid()))
try:
try:
os.unlink(logger)
Modified: branches/rel-1/freevo/src/config.py
==============================================================================
--- branches/rel-1/freevo/src/config.py (original)
+++ branches/rel-1/freevo/src/config.py Tue Aug 7 16:28:42 2007
@@ -102,7 +102,7 @@
self.logtype = logtype
appname = os.path.splitext(os.path.basename(sys.argv[0]))[0]
try:
- self.logfile = '%s/%s-%s.log' % (LOGDIR, appname, os.getuid())
+ self.logfile = '%s/%s-%s.log' % (FREEVO_LOGDIR, appname,
os.getuid())
self.fp = open(self.logfile, 'a')
logging.basicConfig(level=LOGGING, \
#datefmt='%a, %H:%M:%S',
@@ -278,15 +278,75 @@
LOGGING = logging.DEBUG
+
+def make_freevodir(envvar, linux_dir, bsd_dir, private_dir):
+ '''Make the freevo specific directory and return it's name
+ '''
+ if os.environ.has_key('OS_' + envvar):
+ os_dirname = os.environ['OS_' + envvar]
+ elif os.uname()[0] == 'FreeBSD':
+ os_dirname = bsd_dir
+ else:
+ os_dirname = linux_dir
+
+ if os.environ.has_key('FREEVO_' + envvar):
+ freevo_dirname = os.environ['FREEVO_' + envvar]
+ else:
+ freevo_dirname = os.path.join(os_dirname, 'freevo')
+
+ if not os.path.isdir(freevo_dirname):
+ try:
+ print 'trying "%s"...' % (freevo_dirname)
+ os.makedirs(freevo_dirname)
+ except OSError:
+ freevo_dirname = os.path.join(os.environ['HOME'], '.freevo',
private_dir)
+ if not os.path.isdir(freevo_dirname):
+ try:
+ print 'trying "%s"...' % (freevo_dirname)
+ os.makedirs(freevo_dirname)
+ except OSError, e:
+ print 'Warning: %s does not exists and can\'t be created'
% freevo_dirname
+ print 'Please create this directory as root and set
permissions for the'
+ print 'Freevo user to write to it.'
+ os_dirname = '/tmp'
+ freevo_dirname = os.path.join(os_dirname, 'freevo')
+ if not os.path.isdir(freevo_dirname):
+ try:
+ print 'trying "%s"...' % (freevo_dirname)
+ os.makedirs(freevo_dirname)
+ except OSError:
+ os_dirname = '/tmp'
+ freevo_dirname = os.path.join(os_dirname,
('freevo-' + os.getuid()), private_dir)
+ if not os.path.isdir(freevo_dirname):
+ print 'trying "%s"...' % (freevo_dirname)
+ os.makedirs(freevo_dirname)
+ print 'Using %s as cache directory, but this is a bad
idea' % freevo_dirname
+ print
+ return (os_dirname, freevo_dirname)
+
+
#
# find the log directory
#
-if os.path.isdir('/var/log/freevo'):
- LOGDIR = '/var/log/freevo'
-else:
- LOGDIR = '/tmp/freevo'
- if not os.path.isdir(LOGDIR):
- os.makedirs(LOGDIR)
+OS_LOGDIR, FREEVO_LOGDIR = make_freevodir('LOGDIR', '/var/log', '/var/log',
'log')
+
+#
+# Freevo static dir:
+#
+# Under Linux, use /var/lib. Under FreeBSD, use /var/db.
+#
+OS_STATICDIR, FREEVO_STATICDIR = make_freevodir('STATICDIR', '/var/lib',
'/var/db', 'static')
+
+#
+# Freevo cache dir:
+#
+# Under Linux, use /var/cache. Under FreeBSD, use /var/db.
+#
+OS_CACHEDIR, FREEVO_CACHEDIR = make_freevodir('CACHEDIR', '/var/cache',
'/var/db', 'cache')
+
+print 'log: %s %s' % (OS_LOGDIR, FREEVO_LOGDIR)
+print 'static: %s %s' % (OS_STATICDIR, FREEVO_STATICDIR)
+print 'cache: %s %s' % (OS_CACHEDIR, FREEVO_CACHEDIR)
#
# Redirect stdout and stderr to stdout and /tmp/freevo.log
@@ -456,46 +516,6 @@
setattr(CONF, valname, '')
#
-# Freevo cache dir:
-#
-# Under Linux, use /var/cache. Under FreeBSD, use /var/db.
-#
-if os.environ.has_key('OS_CACHEDIR'):
- OS_CACHEDIR = os.environ['OS_CACHEDIR']
-elif os.uname()[0] == 'FreeBSD':
- OS_CACHEDIR = '/var/db'
-else:
- OS_CACHEDIR = '/var/cache'
-
-if os.environ.has_key('FREEVO_CACHEDIR'):
- FREEVO_CACHEDIR = os.environ['FREEVO_CACHEDIR']
-else:
- FREEVO_CACHEDIR = OS_CACHEDIR + '/freevo'
-
-if not os.path.isdir(FREEVO_CACHEDIR):
- try:
- os.makedirs(FREEVO_CACHEDIR)
-
- except OSError:
- print 'Warning: %s does not exists and can\'t be created' %
FREEVO_CACHEDIR
- print 'Please create this directory as root and set permissions for
the'
- print 'Freevo user to write to it.'
- OS_CACHEDIR = '/tmp'
- FREEVO_CACHEDIR = OS_CACHEDIR + '/freevo'
-
- if not os.path.isdir( FREEVO_CACHEDIR ):
- try:
- os.makedirs( FREEVO_CACHEDIR )
- except OSError:
- OS_CACHEDIR = '/tmp/'
- FREEVO_CACHEDIR = OS_CACHEDIR + '/freevo-' + os.getuid()
- if not os.path.isdir( FREEVO_CACHEDIR ):
- os.makedirs( FREEVO_CACHEDIR )
- print 'Using %s as cache directory, but this is a bad idea' %
FREEVO_CACHEDIR
- print
-
-
-#
# fall back to x11 if display is mga or fb and DISPLAY ist set
# or switch to fbdev if we have no DISPLAY and x11 or dga is used
#
@@ -926,7 +946,7 @@
#
# create cache subdirs
#
-
+print 'overlay: %s' % (OVERLAY_DIR)
if not OVERLAY_DIR or OVERLAY_DIR == '/':
print
print 'ERROR: bad OVERLAY_DIR.'
@@ -952,6 +972,7 @@
if not os.path.isdir(OVERLAY_DIR + '/disc-set'):
os.makedirs(OVERLAY_DIR + '/disc-set')
+
#
# delete LD_PRELOAD for all helpers, main.py does it after
# starting the display
Modified: branches/rel-1/freevo/src/helpers/commdetectserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/commdetectserver.py (original)
+++ branches/rel-1/freevo/src/helpers/commdetectserver.py Tue Aug 7
16:28:42 2007
@@ -57,7 +57,7 @@
DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG')
or config.DEBUG
-logfile = '%s/%s-%s.log' % (config.LOGDIR, appname, os.getuid())
+logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
log.startLogging(open(logfile, 'a'))
def _debug_(text, level=1):
Modified: branches/rel-1/freevo/src/helpers/encodingserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/encodingserver.py (original)
+++ branches/rel-1/freevo/src/helpers/encodingserver.py Tue Aug 7 16:28:42 2007
@@ -66,7 +66,7 @@
DEBUG = hasattr(config, appconf+'_DEBUG') and eval('config.'+appconf+'_DEBUG')
or config.DEBUG
-logfile = '%s/%s-%s.log' % (config.LOGDIR, appname, os.getuid())
+logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
log.startLogging(open(logfile, 'a'))
def _debug_(text, level=1):
Modified: branches/rel-1/freevo/src/helpers/recordserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/recordserver.py (original)
+++ branches/rel-1/freevo/src/helpers/recordserver.py Tue Aug 7 16:28:42 2007
@@ -116,7 +116,7 @@
__builtin__.__dict__['_debug_']= _debug_func_
-logfile = '%s/%s-%s.log' % (config.LOGDIR, appname, os.getuid())
+logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
sys.stdout = open(logfile, 'a')
sys.stderr = sys.stdout
Modified: branches/rel-1/freevo/src/helpers/rssserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/rssserver.py (original)
+++ branches/rel-1/freevo/src/helpers/rssserver.py Tue Aug 7 16:28:42 2007
@@ -82,7 +82,7 @@
sys.exit(0)
-logfile = '%s/%s-%s.log' % (config.LOGDIR, appname, os.getuid())
+logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
log.startLogging(open(logfile, 'a'))
# check for expired files and delete them
Modified: branches/rel-1/freevo/src/helpers/webserver.py
==============================================================================
--- branches/rel-1/freevo/src/helpers/webserver.py (original)
+++ branches/rel-1/freevo/src/helpers/webserver.py Tue Aug 7 16:28:42 2007
@@ -82,7 +82,7 @@
def main():
# the start and stop stuff will be handled from the freevo script
- logfile = '%s/%s-%s.log' % (config.LOGDIR, appname, os.getuid())
+ logfile = '%s/%s-%s.log' % (config.FREEVO_LOGDIR, appname, os.getuid())
log.startLogging(open(logfile, 'a'))
if os.path.isdir(os.path.join(os.environ['FREEVO_PYTHON'], 'www/htdocs')):
Modified: branches/rel-1/freevo/src/main.py
==============================================================================
--- branches/rel-1/freevo/src/main.py (original)
+++ branches/rel-1/freevo/src/main.py Tue Aug 7 16:28:42 2007
@@ -375,7 +375,7 @@
# activate a trace function
if sys.argv[1] == '-trace':
- tracefd = open(os.path.join(config.LOGDIR, 'trace.txt'), 'w')
+ tracefd = open(os.path.join(config.FREEVO_LOGDIR, 'trace.txt'), 'w')
sys.settrace(tracefunc)
config.DEBUG = 2
Modified: branches/rel-1/freevo/src/plugins/cd_burn.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/cd_burn.py (original)
+++ branches/rel-1/freevo/src/plugins/cd_burn.py Tue Aug 7 16:28:42 2007
@@ -111,7 +111,7 @@
class Logger:
def __init__(self):
_debug_('__init__(self)')
- self.filename = '%s/%s-%s.log' % (config.LOGDIR, 'burn_cd-helpers',
os.getuid())
+ self.filename = '%s/%s-%s.log' % (config.FREEVO_LOGDIR,
'burn_cd-helpers', os.getuid())
self.file = file(self.filename,"a")
def log (self,line=None):
Modified: branches/rel-1/freevo/src/plugins/command.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/command.py (original)
+++ branches/rel-1/freevo/src/plugins/command.py Tue Aug 7 16:28:42 2007
@@ -55,7 +55,7 @@
from gui.PopupBox import PopupBox
def islog(name):
- f = open(os.path.join(config.LOGDIR, 'command-std%s-%s.log' % (name,
os.getuid())))
+ f = open(os.path.join(config.FREEVO_LOGDIR, 'command-std%s-%s.log' %
(name, os.getuid())))
data = f.readline()
if name == 'out':
data = f.readline()
@@ -171,11 +171,11 @@
if selection == 'ok':
self.destroy()
elif selection == 'out':
- LogScroll(os.path.join(config.LOGDIR,'command-stdout.log'),
+
LogScroll(os.path.join(config.FREEVO_LOGDIR,'command-stdout.log'),
text=_('Stdout File')).show()
return
elif selection == 'err':
- LogScroll(os.path.join(config.LOGDIR,'command-stderr.log'),
+
LogScroll(os.path.join(config.FREEVO_LOGDIR,'command-stderr.log'),
text=_('Stderr File')).show()
return
elif event == INPUT_EXIT:
Modified: branches/rel-1/freevo/src/rssperiodic.py
==============================================================================
--- branches/rel-1/freevo/src/rssperiodic.py (original)
+++ branches/rel-1/freevo/src/rssperiodic.py Tue Aug 7 16:28:42 2007
@@ -262,13 +262,13 @@
if len(glob.glob(filename)) == 0 and not
checkForDup(item.url):
if re.search("torrent", item.url):
_debug_("Running bittorrent download from %s" %
item.url)
- cmdlog=open(os.path.join(config.LOGDIR,
'rss-bittorrent.out'), 'a')
+ cmdlog=open(os.path.join(config.FREEVO_LOGDIR,
'rss-bittorrent.out'), 'a')
p = Popen('bittorrent-console %s' % (item.url),
shell=True, stderr=cmdlog, stdout=cmdlog)
exitStatus = p.wait()
filename=re.sub("\.torrent","",filename)
else:
_debug_("Running wget download from %s" %
(item.url))
- cmdlog=open(os.path.join(config.LOGDIR,
'rss-wget.out'), 'a')
+ cmdlog=open(os.path.join(config.FREEVO_LOGDIR,
'rss-wget.out'), 'a')
p = Popen('wget -O %s %s' % (filename, item.url),
shell=True, stderr=cmdlog, stdout=cmdlog)
exitStatus = p.wait()
if exitStatus:
Modified: branches/rel-1/freevo/src/tv/plugins/generic_record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/generic_record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/generic_record.py Tue Aug 7
16:28:42 2007
@@ -112,8 +112,8 @@
def __init__(self, app):
if DEBUG:
- fname_out = os.path.join(config.LOGDIR, 'recorder_stdout.log')
- fname_err = os.path.join(config.LOGDIR, 'recorder_stderr.log')
+ fname_out = os.path.join(config.FREEVO_LOGDIR,
'recorder_stdout.log')
+ fname_err = os.path.join(config.FREEVO_LOGDIR,
'recorder_stderr.log')
try:
self.log_stdout = open(fname_out, 'a')
self.log_stderr = open(fname_err, 'a')
Modified: branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py
==============================================================================
--- branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py (original)
+++ branches/rel-1/freevo/src/tv/plugins/vbi2srt_record.py Tue Aug 7
16:28:42 2007
@@ -181,8 +181,8 @@
def __init__(self, app):
if DEBUG:
- fname_out = os.path.join(config.LOGDIR, 'vbi2srt-stdout.log')
- fname_err = os.path.join(config.LOGDIR, 'vbi2srt-stderr.log')
+ fname_out = os.path.join(config.FREEVO_LOGDIR,
'vbi2srt-stdout.log')
+ fname_err = os.path.join(config.FREEVO_LOGDIR,
'vbi2srt-stderr.log')
try:
self.log_stdout = open(fname_out, 'a')
self.log_stderr = open(fname_err, 'a')
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
