Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1:/tmp/cvs-serv26768
Modified Files:
__init__.py fileops.py misc.py
Log Message:
use new vfs
Index: __init__.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** __init__.py 2 Nov 2003 10:50:40 -0000 1.4
--- __init__.py 22 Nov 2003 20:34:08 -0000 1.5
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/11/22 20:34:08 dischi
+ # use new vfs
+ #
# Revision 1.4 2003/11/02 10:50:40 dischi
# remove debug
***************
*** 53,56 ****
--- 56,64 ----
if sys.argv[0].find('setup.py') == -1 and sys.argv[0].find('install.py') == -1:
+ import vfs
+ import __builtin__
+ __builtin__.__dict__['vfs'] = vfs
+
from misc import *
from fileops import *
+
Index: fileops.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** fileops.py 4 Nov 2003 11:26:07 -0000 1.5
--- fileops.py 22 Nov 2003 20:34:08 -0000 1.6
***************
*** 11,14 ****
--- 11,17 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.6 2003/11/22 20:34:08 dischi
+ # use new vfs
+ #
# Revision 1.5 2003/11/04 11:26:07 dischi
# fix runtime install -- arg
***************
*** 85,90 ****
try:
! dirnames = [ os.path.join(dirname, dname) for dname in os.listdir(dirname)
! if os.path.isdir(os.path.join(dirname, dname)) ]
except OSError:
return []
--- 88,93 ----
try:
! dirnames = [ vfs.join(dirname, dname) for dname in os.listdir(dirname)
! if vfs.isdir(vfs.join(dirname, dname)) ]
except OSError:
return []
***************
*** 159,164 ****
"""
for name in names:
! fullpath = os.path.join(dirname, name)
! if os.path.isfile(fullpath):
result[0].append(fullpath)
result[1] = [dirname] + result[1]
--- 162,167 ----
"""
for name in names:
! fullpath = vfs.join(dirname, name)
! if vfs.isfile(fullpath):
result[0].append(fullpath)
result[1] = [dirname] + result[1]
***************
*** 196,200 ****
"""
! fsuffix = os.path.splitext(filename)[1].lower()[1:]
for suffix in suffixlist:
--- 199,203 ----
"""
! fsuffix = vfs.splitext(filename)[1].lower()[1:]
for suffix in suffixlist:
***************
*** 212,217 ****
try:
! files = [ os.path.join(dirname, fname) for fname in os.listdir(dirname) if
! os.path.isfile(os.path.join(dirname, fname)) ]
except OSError:
print 'util:match_files(): Got error on dir = "%s"' % dirname
--- 215,220 ----
try:
! files = [ vfs.join(dirname, fname) for fname in os.listdir(dirname) if
! vfs.isfile(vfs.join(dirname, fname)) ]
except OSError:
print 'util:match_files(): Got error on dir = "%s"' % dirname
***************
*** 237,241 ****
"""
for name in names:
! fullpath = os.path.join(dirname, name)
result.append(fullpath)
return result
--- 240,244 ----
"""
for name in names:
! fullpath = vfs.join(dirname, name)
result.append(fullpath)
return result
***************
*** 286,296 ****
# check each file
for name in names:
! fullname = os.path.normpath(os.path.join(root, name))
# grab if it matches our pattern and entry type
for pat in pat_list:
if fnmatch.fnmatch(name, pat):
! if os.path.isfile(fullname) or \
! (return_folders and os.path.isdir(fullname)):
result.append(fullname)
continue
--- 289,299 ----
# check each file
for name in names:
! fullname = os.path.normpath(vfs.join(root, name))
# grab if it matches our pattern and entry type
for pat in pat_list:
if fnmatch.fnmatch(name, pat):
! if vfs.isfile(fullname) or \
! (return_folders and vfs.isdir(fullname)):
result.append(fullname)
continue
***************
*** 298,302 ****
# recursively scan other folders, appending results
if recurse:
! if os.path.isdir(fullname) and not os.path.islink(fullname):
result = result + recursefolders( fullname, recurse,
pattern, return_folders )
--- 301,305 ----
# recursively scan other folders, appending results
if recurse:
! if vfs.isdir(fullname) and not vfs.islink(fullname):
result = result + recursefolders( fullname, recurse,
pattern, return_folders )
***************
*** 357,361 ****
# Then set the filename
mountdir = media.mountdir
! full_filename = os.path.join(media.mountdir, file)
break
--- 360,364 ----
# Then set the filename
mountdir = media.mountdir
! full_filename = vfs.join(media.mountdir, file)
break
***************
*** 385,389 ****
"""
try:
! f = open(file, 'r')
try:
data = cPickle.load(f)
--- 388,392 ----
"""
try:
! f = vfs.open(file, 'r')
try:
data = cPickle.load(f)
***************
*** 405,411 ****
"""
try:
! if os.path.isfile(file):
! os.unlink(file)
! f = open(file, 'w')
cPickle.dump(data, f, PICKLE_PROTOCOL)
f.close()
--- 408,414 ----
"""
try:
! if vfs.isfile(file):
! vfs.unlink(file)
! f = vfs.open(file, 'w')
cPickle.dump(data, f, PICKLE_PROTOCOL)
f.close()
***************
*** 413,417 ****
print 'unable to save to cachefile %s' % file
-
-
--- 416,418 ----
Index: misc.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/util/misc.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** misc.py 8 Nov 2003 23:15:42 -0000 1.4
--- misc.py 22 Nov 2003 20:34:08 -0000 1.5
***************
*** 11,27 ****
# -----------------------------------------------------------------------
# $Log$
# Revision 1.4 2003/11/08 23:15:42 outlyer
# Hyphenated words and abbreviations should be upper case in a title.
#
- # Revision 1.3 2003/10/26 17:57:26 dischi
- # do not use tmp as default
- #
- # Revision 1.2 2003/10/14 17:03:38 dischi
- # add smartsort patch from Eirik Meland
- #
- # Revision 1.1 2003/10/11 11:20:11 dischi
- # move util.py into a directory and split it into two files
- #
- #
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
--- 11,20 ----
# -----------------------------------------------------------------------
# $Log$
+ # Revision 1.5 2003/11/22 20:34:08 dischi
+ # use new vfs
+ #
# Revision 1.4 2003/11/08 23:15:42 outlyer
# Hyphenated words and abbreviations should be upper case in a title.
#
# -----------------------------------------------------------------------
# Freevo - A Home Theater PC framework
***************
*** 54,58 ****
import htmlentitydefs
from xml.utils import qp_xml
- import codecs
# Configuration file. Determines where to look for AVI/MP3 files, etc
--- 47,50 ----
***************
*** 163,170 ****
If not return the default
"""
! if os.path.isfile(base+'.png'):
! return base+'.png'
! if os.path.isfile(base+'.jpg'):
! return base+'.jpg'
return default
--- 155,161 ----
If not return the default
"""
! for suffix in ('png', 'jpg', 'gif'):
! if vfs.abspath(base+'.'+suffix):
! return vfs.abspath(base+'.'+suffix)
return default
***************
*** 174,184 ****
make a nicer display name from file
"""
! if not os.path.exists(file):
return file
! name = os.path.splitext(os.path.basename(file))[0]
if not name:
# Bugfix for empty stem
! return os.path.basename(file)
name = name[0].upper() + name[1:]
--- 165,175 ----
make a nicer display name from file
"""
! if not vfs.exists(file):
return file
! name = vfs.splitext(vfs.basename(file))[0]
if not name:
# Bugfix for empty stem
! return vfs.basename(file)
name = name[0].upper() + name[1:]
***************
*** 207,211 ****
try:
! fd = open(cmdline_filename)
cmdline = fd.read()
fd.close()
--- 198,202 ----
try:
! fd = vfs.open(cmdline_filename)
cmdline = fd.read()
fd.close()
***************
*** 248,252 ****
def get_bookmarkfile(filename):
! myfile = os.path.basename(filename)
myfile = config.FREEVO_CACHEDIR + "/" + str(myfile) + '.bookmark'
return myfile
--- 239,243 ----
def get_bookmarkfile(filename):
! myfile = vfs.basename(filename)
myfile = config.FREEVO_CACHEDIR + "/" + str(myfile) + '.bookmark'
return myfile
***************
*** 276,281 ****
Also obviously ignores the full path when looking for 'The' and 'A'
"""
! m = os.path.basename(x)
! n = os.path.basename(y)
for word in ('The', 'A'):
--- 267,272 ----
Also obviously ignores the full path when looking for 'The' and 'A'
"""
! m = vfs.basename(x)
! n = vfs.basename(y)
for word in ('The', 'A'):
***************
*** 288,292 ****
return cmp(m.upper(),n.upper()) # be case insensitive
! def tagmp3 (filename, title=None, artist=None, album=None, track=None,
tracktotal=None, year=None):
"""
use eyeD3 directly from inside mmpython to
--- 279,284 ----
return cmp(m.upper(),n.upper()) # be case insensitive
! def tagmp3 (filename, title=None, artist=None, album=None, track=None,
! tracktotal=None, year=None):
"""
use eyeD3 directly from inside mmpython to
***************
*** 308,326 ****
- def getdatadir(item):
- base = config.MOVIE_DATA_DIR
- if not config.MOVIE_DATA_DIR:
- base = '/tmp/freevo-movie-data-dir'
- directory = item.dir
- if item.media:
- directory = directory[len(item.media.mountdir):]
- if len(directory) and directory[0] == '/':
- directory = directory[1:]
- return os.path.join(base, 'disc', item.media.id, directory)
- else:
- if len(directory) and directory[0] == '/':
- directory = directory[1:]
- return os.path.join(base, directory)
-
def encode(str, code):
try:
--- 300,303 ----
***************
*** 399,406 ****
qp_xml.Parser.__init__(self)
self.filename = filename
! if not os.path.isfile(filename):
self.tree = XMLnode('freevo')
else:
! f = open(filename)
self.tree = self.parse(f)
f.close()
--- 376,383 ----
qp_xml.Parser.__init__(self)
self.filename = filename
! if not vfs.isfile(filename):
self.tree = XMLnode('freevo')
else:
! f = vfs.open(filename)
self.tree = self.parse(f)
f.close()
***************
*** 417,423 ****
if not filename:
filename = self.filename
! if os.path.isfile(filename):
! os.unlink(filename)
! f = codecs.open(filename , 'w', encoding='utf-8')
f.write('<?xml version="1.0" ?>\n')
self._dump_recurse(f, self.tree)
--- 394,400 ----
if not filename:
filename = self.filename
! if vfs.isfile(filename):
! vfs.unlink(filename)
! f = vfs.codecs_open(filename, 'w', encoding='utf-8')
f.write('<?xml version="1.0" ?>\n')
self._dump_recurse(f, self.tree)
-------------------------------------------------------
This SF.net email is sponsored by: SF.net Giveback Program.
Does SourceForge.net help you be more productive? Does it
help you create better code? SHARE THE LOVE, and help us help
YOU! Click Here: http://sourceforge.net/donate/
_______________________________________________
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
