[Freevo-devel] multiple freevos on one box
sorry if this has been answered, but listsearching and googling did bring up something useful... i need to have one stable freevo running for the family, but also want to stay in touch with new developments and help with bugfixing. how can i set up two versions of freevo on one box without interference? where is all temporary/caching/logging stuff saved and how can i change these paths? Flo --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-devel
Re: [Freevo-devel] unicode & other bugs/problems
Florian Demmer wrote:
just updated from cvs... lots of problems with scheduling recordings
and other...
[...]
it seems that the recordserver does not work. i get this when i try to
load http://
2004/02/28 02:06 CET [HTTPChannel,23,192.168.1.10] Traceback (most
recent call last):
File
"/usr/lib/python2.3/site-packages/twisted/protocols/basic.py", line 223,
in dataReceived
why = self.lineReceived(line)
File
"/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 950,
in lineReceived
self.allContentReceived()
File
"/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 991,
in allContentReceived
req.requestReceived(command, path, version)
File
"/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 549,
in requestReceived
self.process()
--- ---
File "/usr/lib/python2.3/site-packages/twisted/web/server.py",
line 159, in process
self.render(resrc)
File "/usr/lib/python2.3/site-packages/twisted/web/server.py",
line 166, in render
body = resrc.render(self)
File "/usr/lib/python2.3/site-packages/twisted/web/xmlrpc.py",
line 121, in render
args, functionPath = xmlrpclib.loads(request.content.read())
File "/usr/lib/python2.3/xmlrpclib.py", line 1013, in loads
p.close()
File "/usr/lib/python2.3/xmlrpclib.py", line 531, in close
self._parser.Parse("", 1) # end of data
xml.parsers.expat.ExpatError: no element found: line 1, column 0
could it be that my xml data is wrong formatted? i generate it with the
windows version of the netxtview epg decoder, but never had such
problems before... i dont know much about xml or xmltv but the file
looks good to me: starts with xml version tag, doctype, tv tag with
several keys... and the tv end-tag also exists at the end of the file.
Flo
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-devel
[Freevo-devel] unicode & other bugs/problems
just updated from cvs... lots of problems with scheduling recordings and other... here is what i get when i try to get the list of schelduled recordings (using the webserver), from the log: 2004/02/28 01:31 CET [HTTPChannel,0,192.168.1.10] Traceback (most recent call last): File "/usr/lib/python2.3/site-packages/twisted/protocols/basic.py", line 223, in dataReceived why = self.lineReceived(line) File "/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 950, in lineReceived self.allContentReceived() File "/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 991, in allContentReceived req.requestReceived(command, path, version) File "/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 549, in requestReceived self.process() --- --- File "/usr/lib/python2.3/site-packages/twisted/web/server.py", line 159, in process self.render(resrc) File "/usr/lib/python2.3/site-packages/twisted/web/server.py", line 166, in render body = resrc.render(self) File "/usr/lib/python2.3/site-packages/freevo/www/web_types.py", line 133, in render return self._render(request) File "/usr/share/freevo/htdocs/record.rpy", line 170, in _render progs = recordings.getProgramList() exceptions.AttributeError: 'unicode' object has no attribute 'getProgramList' then the tv guide: it says "Messages: ERROR: Recording server is unavailable." though it tells me that the server is runnign at the frontpage (after i started it) trying to schedule anything i get this message: "ERROR: No program found on CNI0AC2 at 02/28/04 01:55:00. (record_client: connection error)" i have the information about this show in xml (without timezone correction): last problem: i have a file with a german umlaut a in my media library and i get the following when browsing (again using web) 2004/02/28 01:34 CET [HTTPChannel,0,192.168.1.10] Traceback (most recent call last): File "/usr/lib/python2.3/site-packages/twisted/protocols/basic.py", line 223, in dataReceived why = self.lineReceived(line) File "/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 950, in lineReceived self.allContentReceived() File "/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 991, in allContentReceived req.requestReceived(command, path, version) File "/usr/lib/python2.3/site-packages/twisted/protocols/http.py", line 549, in requestReceived self.process() --- --- File "/usr/lib/python2.3/site-packages/twisted/web/server.py", line 159, in process self.render(resrc) File "/usr/lib/python2.3/site-packages/twisted/web/server.py", line 166, in render body = resrc.render(self) File "/usr/lib/python2.3/site-packages/freevo/www/web_types.py", line 133, in render return self._render(request) File "/usr/share/freevo/htdocs/library.rpy", line 409, in _render directorylist = util.getdirnames(action_dir) File "/usr/lib/python2.3/site-packages/freevo/util/fileops.py", line 123, in getdirnames dirnames = [ dirname + dname for dname in os.listdir(dirname) if \ exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0x84 in position 8: ordinal not in range(128) i hope these things can be fixed easily thanks for freevo Flo --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-devel
[Freevo-cvslog] freevo/src directory.py,1.122,1.123
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19193 Modified Files: directory.py Log Message: remove debug Index: directory.py === RCS file: /cvsroot/freevo/freevo/src/directory.py,v retrieving revision 1.122 retrieving revision 1.123 diff -C2 -d -r1.122 -r1.123 *** directory.py27 Feb 2004 20:11:19 - 1.122 --- directory.py27 Feb 2004 21:38:16 - 1.123 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.123 2004/02/27 21:38:16 dischi + # remove debug + # # Revision 1.122 2004/02/27 20:11:19 dischi # o fix umount while scanning the dir *** *** 642,646 # normal DirItems for filename in files: - print filename if os.path.isdir(filename): d = DirItem(filename, self, display_type = self.display_type) --- 645,648 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util mediainfo.py,1.33,1.34
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7670/src/util
Modified Files:
mediainfo.py
Log Message:
save disc file info
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** mediainfo.py27 Feb 2004 20:27:18 - 1.33
--- mediainfo.py27 Feb 2004 20:42:05 - 1.34
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.34 2004/02/27 20:42:05 dischi
+ # save disc file info
+ #
# Revision 1.33 2004/02/27 20:27:18 dischi
# add number of files to rom drives
***
*** 604,614
metainfo = {}
! if mmdata.mime == 'unknown/unknown':
! media.mount()
! for type in ('video', 'audio', 'image'):
! items = getattr(config, '%s_SUFFIX' % type.upper())
! files = util.match_files_recursively(media.mountdir, items)
! metainfo['disc_num_%s' % type] = len(files)
! media.umount()
info = Info(cachefile, mmdata, metainfo)
--- 607,618
metainfo = {}
! if mmdata.mime == 'unknown/unknown' and not metainfo.has_key('disc_num_video'):
! media.mount()
! for type in ('video', 'audio', 'image'):
! items = getattr(config, '%s_SUFFIX' % type.upper())
! files = util.match_files_recursively(media.mountdir, items)
! metainfo['disc_num_%s' % type] = len(files)
! media.umount()
! util.save_pickle(metainfo, cachefile)
info = Info(cachefile, mmdata, metainfo)
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers cache.py,1.27,1.28
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7526/src/helpers Modified Files: cache.py Log Message: better rebuild Index: cache.py === RCS file: /cvsroot/freevo/freevo/src/helpers/cache.py,v retrieving revision 1.27 retrieving revision 1.28 diff -C2 -d -r1.27 -r1.28 *** cache.py27 Feb 2004 20:27:45 - 1.27 --- cache.py27 Feb 2004 20:41:38 - 1.28 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.28 2004/02/27 20:41:38 dischi + # better rebuild + # # Revision 1.27 2004/02/27 20:27:45 dischi # increase cache version *** *** 160,164 for f in util.match_files(config.OVERLAY_DIR + '/disc/metadata', ['mmpython']): os.unlink(f) - print f print 'done' --- 163,166 *** *** 398,401 --- 400,409 + print 'Freevo cache' + print + print 'Freevo will now generate a metadata cache for all your files and' + print 'create thumbnails from images for faster access.' + print + # check for current cache informations if (len(sys.argv)>1 and sys.argv[1] == '--rebuild'): *** *** 413,420 print print 'Unable to detect last complete rebuild, forcing rebuild' ! rebuild = 2 complete_update = int(time.time()) else: ! complete_update = info[-1] except ImportError: print --- 421,439 print print 'Unable to detect last complete rebuild, forcing rebuild' ! rebuild = 2 complete_update = int(time.time()) else: ! if len(info) == 3: ! mmchanged, part_update, complete_update = info ! freevo_changed = 0 ! else: ! mmchanged, freevo_changed, part_update, complete_update = info ! ! # let's warn about some updates ! if freevo_changed < VERSION: ! print 'Cache too old, forcing rebuild' ! rebuild = 2 ! complete_update = int(time.time()) ! except ImportError: print *** *** 427,435 print - print 'Freevo cache' - print - print 'Freevo will now generate a metadata cache for all your files and' - print 'create thumbnails from images for faster access.' - print start = time.clock() --- 446,449 --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers cache.py,1.26,1.27
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4603/helpers Modified Files: cache.py Log Message: increase cache version Index: cache.py === RCS file: /cvsroot/freevo/freevo/src/helpers/cache.py,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** cache.py27 Feb 2004 20:15:02 - 1.26 --- cache.py27 Feb 2004 20:27:45 - 1.27 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.27 2004/02/27 20:27:45 dischi + # increase cache version + # # Revision 1.26 2004/02/27 20:15:02 dischi # more unicode fixes *** *** 18,24 # also cache playlist dir # - # Revision 1.24 2004/02/13 17:34:18 dischi - # small fix - # # Revision 1.23 2004/02/12 12:22:03 dischi # update cache to new directory metainfo --- 21,24 *** *** 33,71 # cleanup # - # Revision 1.20 2004/02/07 20:46:21 dischi - # more old files to remove - # - # Revision 1.19 2004/02/07 13:08:41 dischi - # also remove covers in vfs if directory is gone - # - # Revision 1.18 2004/02/05 20:39:11 dischi - # check mmpython cache version - # - # Revision 1.17 2004/02/01 17:50:43 dischi - # fix, it deleted all infos on caching :-) - # - # Revision 1.16 2004/01/19 20:25:53 dischi - # sync metainfo before stopping - # - # Revision 1.15 2004/01/18 16:48:29 dischi - # expand caching (including extendedadd.py) - # - # Revision 1.14 2004/01/17 20:30:18 dischi - # use new metainfo - # - # Revision 1.13 2004/01/04 17:20:44 dischi - # support for generating video thumbnails - # - # Revision 1.12 2004/01/03 17:42:03 dischi - # o OVERLAY_DIR is now used everytime - # o added support to delete old cachefile in the overlay dir - # o remove unneeded subdirs in the overlay dir - # - # Revision 1.11 2003/12/31 16:43:28 dischi - # also cache thumbnails for config.OVERLAY_DIR_STORE_THUMBNAILS: - # - # Revision 1.10 2003/12/30 15:36:42 dischi - # support OVERLAY_DIR_STORE_MMPYTHON_DATA - # # --- # Freevo - A Home Theater PC framework --- 33,36 *** *** 108,112 # use this number to keep track of changes in # this helper. Check this against util/mediainfo ! VERSION = 2 def delete_old_files_1(): --- 73,77 # use this number to keep track of changes in # this helper. Check this against util/mediainfo ! VERSION = 3 def delete_old_files_1(): --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util mediainfo.py,1.32,1.33
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4510
Modified Files:
mediainfo.py
Log Message:
add number of files to rom drives
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** mediainfo.py27 Feb 2004 20:15:03 - 1.32
--- mediainfo.py27 Feb 2004 20:27:18 - 1.33
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.33 2004/02/27 20:27:18 dischi
+ # add number of files to rom drives
+ #
# Revision 1.32 2004/02/27 20:15:03 dischi
# more unicode fixes
***
*** 600,603
--- 603,615
else:
metainfo = {}
+
+ if mmdata.mime == 'unknown/unknown':
+ media.mount()
+ for type in ('video', 'audio', 'image'):
+ items = getattr(config, '%s_SUFFIX' % type.upper())
+ files = util.match_files_recursively(media.mountdir, items)
+ metainfo['disc_num_%s' % type] = len(files)
+ media.umount()
+
info = Info(cachefile, mmdata, metainfo)
info.disc = True
***
*** 687,693
mmchanged, freevo_changed, part_update, complete_update = info
# let's warn about some updates
! if freevo_changed < 2:
print
! print 'Warning: Freevo cache helper updated.'
print 'Please rerun \'freevo cache\' to speed up Freevo'
print
--- 699,705
mmchanged, freevo_changed, part_update, complete_update = info
# let's warn about some updates
! if freevo_changed < 3:
print
! print 'Warning: Freevo cache helper/informations updated.'
print 'Please rerun \'freevo cache\' to speed up Freevo'
print
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/video videoitem.py,1.128,1.129
Update of /cvsroot/freevo/freevo/src/video In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/video Modified Files: videoitem.py Log Message: more unicode fixes Index: videoitem.py === RCS file: /cvsroot/freevo/freevo/src/video/videoitem.py,v retrieving revision 1.128 retrieving revision 1.129 diff -C2 -d -r1.128 -r1.129 *** videoitem.py22 Feb 2004 20:33:48 - 1.128 --- videoitem.py27 Feb 2004 20:15:03 - 1.129 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.129 2004/02/27 20:15:03 dischi + # more unicode fixes + # # Revision 1.128 2004/02/22 20:33:48 dischi # some unicode fixes *** *** 638,642 # give the event to the next eventhandler in the list ! if isinstance( self.parent, str ): self.parent = None return Item.eventhandler(self, event, menuw) --- 641,645 # give the event to the next eventhandler in the list ! if isstring(self.parent): self.parent = None return Item.eventhandler(self, event, menuw) --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/skins/main area.py,1.35,1.36 info_area.py,1.19,1.20 listing_area.py,1.25,1.26
Update of /cvsroot/freevo/freevo/src/skins/main
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/skins/main
Modified Files:
area.py info_area.py listing_area.py
Log Message:
more unicode fixes
Index: area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/area.py,v
retrieving revision 1.35
retrieving revision 1.36
diff -C2 -d -r1.35 -r1.36
*** area.py 23 Feb 2004 15:32:12 - 1.35
--- area.py 27 Feb 2004 20:15:03 - 1.36
***
*** 28,31
--- 28,34
# ---
# $Log$
+ # Revision 1.36 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.35 2004/02/23 15:32:12 dischi
# fix translation/unicode bug
***
*** 730,738
return 0,0
! if isinstance(image, str):
if isinstance(val, tuple):
! image = self.loadimage(image, val[2:])
else:
! image = self.loadimage(image, val)
if not image:
--- 733,741
return 0,0
! if isstring(image):
if isinstance(val, tuple):
! image = self.loadimage(String(image), val[2:])
else:
! image = self.loadimage(String(image), val)
if not image:
Index: info_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/info_area.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** info_area.py23 Feb 2004 16:34:27 - 1.19
--- info_area.py27 Feb 2004 20:15:03 - 1.20
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.20 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.19 2004/02/23 16:34:27 dischi
# better skin i18n support
***
*** 297,301
if exp:
exp = eval(exp, {'attr': item.getattr}, function_calls)
! if type( exp ) != unicode and type( exp )!= str:
exp = str( exp )
if exp:
--- 300,304
if exp:
exp = eval(exp, {'attr': item.getattr}, function_calls)
! if not isstring(exp):
exp = str( exp )
if exp:
Index: listing_area.py
===
RCS file: /cvsroot/freevo/freevo/src/skins/main/listing_area.py,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** listing_area.py 24 Feb 2004 21:20:30 - 1.25
--- listing_area.py 27 Feb 2004 20:15:03 - 1.26
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.26 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.25 2004/02/24 21:20:30 dischi
# unicode fix
***
*** 406,411
x_mod, table_text[i] = text_or_icon(settings,
table_text[i],
table_x, table_w,
val.font)
! if not (isinstance(table_text[i], str) or
! isinstance(table_text[i], unicode)):
self.drawimage(table_text[i], (table_x + x_mod, y0 +
vskip))
table_text[i] = ''
--- 409,413
x_mod, table_text[i] = text_or_icon(settings,
table_text[i],
table_x, table_w,
val.font)
! if not isstring(table_text[i]):
self.drawimage(table_text[i], (table_x + x_mod, y0 +
vskip))
table_text[i] = ''
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util __init__.py,1.13,1.14 mediainfo.py,1.31,1.32
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/util
Modified Files:
__init__.py mediainfo.py
Log Message:
more unicode fixes
Index: __init__.py
===
RCS file: /cvsroot/freevo/freevo/src/util/__init__.py,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** __init__.py 25 Feb 2004 19:50:51 - 1.13
--- __init__.py 27 Feb 2004 20:15:03 - 1.14
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.14 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.13 2004/02/25 19:50:51 dischi
# fix unicode problem for utf-8
***
*** 67,71
def Unicode(string, encoding=config.encoding):
! if type(string) == str:
try:
return unicode(string, encoding)
--- 70,74
def Unicode(string, encoding=config.encoding):
! if string.__class__ == str:
try:
return unicode(string, encoding)
***
*** 80,84
def String(string, encoding=config.encoding):
! if type(string) == unicode:
return string.encode(encoding, 'replace')
return string
--- 83,87
def String(string, encoding=config.encoding):
! if string.__class__ == unicode:
return string.encode(encoding, 'replace')
return string
Index: mediainfo.py
===
RCS file: /cvsroot/freevo/freevo/src/util/mediainfo.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** mediainfo.py23 Feb 2004 19:27:07 - 1.31
--- mediainfo.py27 Feb 2004 20:15:03 - 1.32
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.32 2004/02/27 20:15:03 dischi
+ # more unicode fixes
+ #
# Revision 1.31 2004/02/23 19:27:07 dischi
# fix mmpython init
***
*** 289,293
if not k in self.uncachable_keys and getattr(object,k) != None:
value = getattr(object,k)
! if isinstance(value, str) or isinstance(value, unicode):
value = Unicode(value.replace('\0', '').lstrip().rstrip())
if value:
--- 292,296
if not k in self.uncachable_keys and getattr(object,k) != None:
value = getattr(object,k)
! if isstring(value):
value = Unicode(value.replace('\0', '').lstrip().rstrip())
if value:
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/plugins mediamenu.py,1.34,1.35
Update of /cvsroot/freevo/freevo/src/plugins In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/plugins Modified Files: mediamenu.py Log Message: more unicode fixes Index: mediamenu.py === RCS file: /cvsroot/freevo/freevo/src/plugins/mediamenu.py,v retrieving revision 1.34 retrieving revision 1.35 diff -C2 -d -r1.34 -r1.35 *** mediamenu.py15 Feb 2004 11:33:19 - 1.34 --- mediamenu.py27 Feb 2004 20:15:02 - 1.35 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.35 2004/02/27 20:15:02 dischi + # more unicode fixes + # # Revision 1.34 2004/02/15 11:33:19 dischi # auto select item if there is only one *** *** 193,198 try: add_args = None ! if isinstance(item, str): ! title, filename = '', item else: (title, filename) = item[:2] --- 196,201 try: add_args = None ! if isstring(item): ! title, filename = u'', item else: (title, filename) = item[:2] --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/helpers cache.py,1.25,1.26
Update of /cvsroot/freevo/freevo/src/helpers In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453/helpers Modified Files: cache.py Log Message: more unicode fixes Index: cache.py === RCS file: /cvsroot/freevo/freevo/src/helpers/cache.py,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** cache.py14 Feb 2004 19:31:31 - 1.25 --- cache.py27 Feb 2004 20:15:02 - 1.26 *** *** 12,15 --- 12,18 # --- # $Log$ + # Revision 1.26 2004/02/27 20:15:02 dischi + # more unicode fixes + # # Revision 1.25 2004/02/14 19:31:31 dischi # also cache playlist dir *** *** 475,479 for type in 'VIDEO', 'AUDIO', 'IMAGE': for d in copy.copy(getattr(config, '%s_ITEMS' % type)): ! if not (isinstance(d, str) or isinstance(d, unicode)): d = d[1] if d == '/': --- 478,482 for type in 'VIDEO', 'AUDIO', 'IMAGE': for d in copy.copy(getattr(config, '%s_ITEMS' % type)): ! if not isstring(d): d = d[1] if d == '/': --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src playlist.py,1.66,1.67
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1453 Modified Files: playlist.py Log Message: more unicode fixes Index: playlist.py === RCS file: /cvsroot/freevo/freevo/src/playlist.py,v retrieving revision 1.66 retrieving revision 1.67 diff -C2 -d -r1.66 -r1.67 *** playlist.py 23 Feb 2004 19:59:34 - 1.66 --- playlist.py 27 Feb 2004 20:15:02 - 1.67 *** *** 10,13 --- 10,16 # --- # $Log$ + # Revision 1.67 2004/02/27 20:15:02 dischi + # more unicode fixes + # # Revision 1.66 2004/02/23 19:59:34 dischi # unicode fixes *** *** 153,157 self.name = Unicode(name) ! if (isinstance(playlist, str) or isinstance(playlist, unicode)) and not name: self.name = util.getname(playlist) --- 156,160 self.name = Unicode(name) ! if isstring(playlist) and not name: self.name = util.getname(playlist) *** *** 301,305 self.get_plugins.append(p) ! if isinstance(playlist, str) or isinstance(playlist, unicode): # it's a filename with a playlist try: --- 304,308 self.get_plugins.append(p) ! if isstring(playlist): # it's a filename with a playlist try: *** *** 318,322 # self.playlist is a list of Items or strings (filenames) ! if not isinstance(playlist, str): for i in playlist: if isinstance(i, Item): --- 321,325 # self.playlist is a list of Items or strings (filenames) ! if not isstring(playlist): for i in playlist: if isinstance(i, Item): --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src event.py,1.41,1.42
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv898/src
Modified Files:
event.py
Log Message:
add global events to avoid duplicate code
Index: event.py
===
RCS file: /cvsroot/freevo/freevo/src/event.py,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -d -r1.41 -r1.42
*** event.py25 Feb 2004 17:44:13 - 1.41
--- event.py27 Feb 2004 20:13:01 - 1.42
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.42 2004/02/27 20:13:01 dischi
+ # add global events to avoid duplicate code
+ #
# Revision 1.41 2004/02/25 17:44:13 dischi
# add special event mapping for tvmenu
***
*** 34,72
# Anyone want to chime in with an idea on how?
#
- # Revision 1.36 2004/01/15 20:46:02 outlyer
- # Added a "RATING" event... press a number from 0-5 to have the sqlite
- # database keep track of your score. The idea is to be able to build
- # playlists automatically of "top rated" songs. When you press the number,
- # the score is printed on the screen via tiny_osd
- #
- # Revision 1.34 2003/12/14 17:27:19 dischi
- # cleanup
- #
- # Revision 1.33 2003/12/10 19:10:35 dischi
- # AUDIO_PLAY_END is not needed anymore
- #
- # Revision 1.32 2003/12/10 19:01:04 dischi
- # add handler for events who know the needed eventhandler
- #
- # Revision 1.31 2003/11/30 19:41:19 dischi
- # add event to toggle interlacing, it is on no key and only works with xine
- #
- # Revision 1.30 2003/11/09 16:03:09 dischi
- # add step size in VOL+- an arg
- #
- # Revision 1.29 2003/11/09 12:01:25 dischi
- # add subtitle selection and osd info support for xine
- #
- # Revision 1.28 2003/10/23 02:26:52 outlyer
- # Bugfix for missing 'menu' button; it was here before, and it was removed
- # for some reason.
- #
- # Most DVDs have multiple menus, but not all DVDs have a TitleMenu, so under
- # the previous event structure, you could only move to the topmost menu, and
- # only if it was designated as such.
- #
- # This patch allows the old behaviour (from when I first implemented code to
- # support Dischi's Xine patches) which works with more DVDs.
- #
# ---
# Freevo - A Home Theater PC framework
--- 37,40
***
*** 158,163
# local.conf (setting VOL+ step size to 2)
#
! # for k in EVENTS:
! # EVENTS[k]['VOL+'] = Event('MIXER_VOLUP', arg=1)
--- 126,130
# local.conf (setting VOL+ step size to 2)
#
! # EVENTS['global']['VOL+'] = Event('MIXER_VOLUP', arg=1)
***
*** 231,234
--- 198,203
NEXT = Event('NEXT')
PREV = Event('PREV')
+
+
#
# Audio module
***
*** 320,327
'ENTER' : MENU_SUBMENU,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'EJECT' : EJECT,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 289,293
'ENTER' : MENU_SUBMENU,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'EJECT' : EJECT
}
***
*** 337,344
'SELECT': MENU_SELECT,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'REC' : TV_START_RECORDING,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 303,307
'SELECT': MENU_SELECT,
'DISPLAY' : MENU_CHANGE_STYLE,
! 'REC' : TV_START_RECORDING
}
***
*** 362,369
'0' : INPUT_0,
'CH+' : MENU_PAGEUP,
! 'CH-' : MENU_PAGEDOWN,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 325,329
'0' : INPUT_0,
'CH+' : MENU_PAGEUP,
! 'CH-' : MENU_PAGEDOWN
}
***
*** 381,387
'FFWD' : Event(SEEK, arg=10),
'DISPLAY' : TOGGLE_OSD,
- 'VOL+' : MIXER_VOLUP,
- 'VOL-' : MIXER_VOLDOWN,
- 'MUTE' : MIXER_MUTE,
'0' : INPUT_0,
'1' : INPUT_1,
--- 341,344
***
*** 412,419
'DISPLAY' : TOGGLE_OSD,
'REC' : STORE_BOOKMARK,
! '0' : VIDEO_MANUAL_SEEK,
! 'VOL+' : MIXER_VOLUP,
! 'VOL-' : MIXER_VOLDOWN,
! 'MUTE' : MIXER_MUTE
}
--- 369,373
'DISPLAY' : TOGGLE_OSD,
'REC' : STORE_BOOKMARK,
! '0' : VIDEO_MANUAL_SEEK
}
***
*** 435,441
'GUIDE' : DVDNAV_TITLEMENU,
'MENU' : DVDNAV_MENU,
- 'VOL+' : MIXER_VOLUP,
- 'VOL-' : MIXER_VOLDOWN,
- 'MUTE' : MIXER_MUTE,
'CH+' : NEXT,
'CH-' : PREV
--- 389,392
***
*** 462,469
[Freevo-cvslog] freevo freevo_config.py,1.321,1.322
Update of /cvsroot/freevo/freevo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv898 Modified Files: freevo_config.py Log Message: add global events to avoid duplicate code Index: freevo_config.py === RCS file: /cvsroot/freevo/freevo/freevo_config.py,v retrieving revision 1.321 retrieving revision 1.322 diff -C2 -d -r1.321 -r1.322 *** freevo_config.py25 Feb 2004 17:44:12 - 1.321 --- freevo_config.py27 Feb 2004 20:13:01 - 1.322 *** *** 292,296 'audio' : AUDIO_EVENTS, 'games' : GAMES_EVENTS, ! 'image' : IMAGE_EVENTS } --- 292,297 'audio' : AUDIO_EVENTS, 'games' : GAMES_EVENTS, ! 'image' : IMAGE_EVENTS, ! 'global' : GLOBAL_EVENTS } --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src main.py,1.117,1.118 osd.py,1.142,1.143 rc.py,1.28,1.29
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv777
Modified Files:
main.py osd.py rc.py
Log Message:
reworked rc.py to make several classes
Index: main.py
===
RCS file: /cvsroot/freevo/freevo/src/main.py,v
retrieving revision 1.117
retrieving revision 1.118
diff -C2 -d -r1.117 -r1.118
*** main.py 23 Feb 2004 19:27:07 - 1.117
--- main.py 27 Feb 2004 20:12:16 - 1.118
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.118 2004/02/27 20:12:16 dischi
+ # reworked rc.py to make several classes
+ #
# Revision 1.117 2004/02/23 19:27:07 dischi
# fix mmpython init
***
*** 189,193
items += [ SkinSelectItem(self, name, image, skinfile) ]
! menuw.pushmenu(menu.Menu('SKIN SELECTOR', items))
return True
--- 192,196
items += [ SkinSelectItem(self, name, image, skinfile) ]
! menuw.pushmenu(menu.Menu(_('Skin Selector'), items))
return True
***
*** 393,397
while 1:
! event, event_repeat_count = rc_object.poll()
# OK, now we have a repeat_count... to whom could we give it?
if event:
--- 396,400
while 1:
! event = rc_object.poll()
# OK, now we have a repeat_count... to whom could we give it?
if event:
Index: osd.py
===
RCS file: /cvsroot/freevo/freevo/src/osd.py,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -d -r1.142 -r1.143
*** osd.py 19 Feb 2004 04:57:55 - 1.142
--- osd.py 27 Feb 2004 20:12:16 - 1.143
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.143 2004/02/27 20:12:16 dischi
+ # reworked rc.py to make several classes
+ #
# Revision 1.142 2004/02/19 04:57:55 gsbarbieri
# Support Web Interface i18n.
***
*** 268,284
- def stringproxy(str):
- """
- Return a unicode representation of a String or Unicode object
- """
- result = str
- try:
- if type(str) == StringType:
- result = unicode(str, 'unicode-escape')
- except:
- pass
- return result
-
-
class Font:
def __init__(self, filename='', ptsize=0, font=None):
--- 271,274
***
*** 514,523
self.toggle_fullscreen()
! help = [_('z = Toggle Fullscreen')]
! help += [_('Arrow Keys = Move')]
! help += [_('Spacebar = Select')]
! help += [_('Escape = Stop/Prev. Menu')]
! help += [_('h = Help')]
help_str = ''.join(help)
pygame.display.set_caption('Freevo' + ' '*7 + String( help_str ) )
icon = pygame.image.load(os.path.join(config.ICON_DIR,
--- 504,515
self.toggle_fullscreen()
! help = [ _('z = Toggle Fullscreen'),
! _('Arrow Keys = Move'),
! _('Spacebar = Select'),
! _('Escape = Stop/Prev. Menu'),
! _('h = Help') ]
!
help_str = ''.join(help)
+
pygame.display.set_caption('Freevo' + ' '*7 + String( help_str ) )
icon = pygame.image.load(os.path.join(config.ICON_DIR,
***
*** 572,576
! def _cb(self):
"""
callback for SDL event (not Freevo events)
--- 564,568
! def _cb(self, map=True):
"""
callback for SDL event (not Freevo events)
***
*** 596,602
if event.type == NOEVENT:
! return None
!
if event.type == KEYDOWN:
if event.key in config.KEYMAP.keys():
# Turn off the helpscreen if it was on
--- 588,600
if event.type == NOEVENT:
! return
!
if event.type == KEYDOWN:
+ if not map and event.key > 30:
+ try:
+ return chr(event.key)
+ except:
+ pass
+
if event.key in config.KEYMAP.keys():
# Turn off the helpscreen if it was on
***
*** 604,611
--- 602,612
self._helpscreen()
return config.KEYMAP[event.key]
+
elif event.key == K_h:
self._helpscreen()
+
elif event.key == K_z:
self.toggle_fullscreen()
+
elif event.key == K_F10:
# Take a screenshot
***
*** 613
[Freevo-cvslog] freevo/src directory.py,1.121,1.122
Update of /cvsroot/freevo/freevo/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv402 Modified Files: directory.py Log Message: o fix umount while scanning the dir o shorten name if they start similar Index: directory.py === RCS file: /cvsroot/freevo/freevo/src/directory.py,v retrieving revision 1.121 retrieving revision 1.122 diff -C2 -d -r1.121 -r1.122 *** directory.py25 Feb 2004 17:57:11 - 1.121 --- directory.py27 Feb 2004 20:11:19 - 1.122 *** *** 10,13 --- 10,17 # --- # $Log$ + # Revision 1.122 2004/02/27 20:11:19 dischi + # o fix umount while scanning the dir + # o shorten name if they start similar + # # Revision 1.121 2004/02/25 17:57:11 dischi # bugfix: call parse() for fxd files *** *** 396,401 --- 400,408 if not num_timestamp or num_timestamp < timestamp: + need_umount = False if self.media: + need_umount = not self.media.is_mounted() self.media.mount() + num_dir_items = 0 num_play_items = 0 *** *** 417,421 self['num_dir_items'] = num_dir_items self['num_%s_timestamp' % name] = timestamp ! if self.media: self.media.umount() --- 424,429 self['num_dir_items'] = num_dir_items self['num_%s_timestamp' % name] = timestamp ! ! if need_umount: self.media.umount() *** *** 597,601 files = vfs.listdir(self.dir, include_overlay=True) num_changes = mediainfo.check_cache(self.dir) ! pop = None callback=None --- 605,609 files = vfs.listdir(self.dir, include_overlay=True) num_changes = mediainfo.check_cache(self.dir) ! pop = None callback=None *** *** 634,641 --- 642,665 # normal DirItems for filename in files: + print filename if os.path.isdir(filename): d = DirItem(filename, self, display_type = self.display_type) self.dir_items.append(d) + # remove same begiing from all play_items + substr = '' + if len(self.play_items) > 4 and len(self.play_items[0].name) > 5: + substr = self.play_items[0].name[:-5].lower() + for i in self.play_items[1:]: + if len(i.name) > 5: + substr = util.find_start_string(i.name.lower(), substr) + if not substr: + break + else: + break + else: + for i in self.play_items: + i.name = util.remove_start_string(i.name, substr) + # # sort all items --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src config.py,1.99,1.100
Update of /cvsroot/freevo/freevo/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32682
Modified Files:
config.py
Log Message:
helper function to check if an object is some sort of string
Index: config.py
===
RCS file: /cvsroot/freevo/freevo/src/config.py,v
retrieving revision 1.99
retrieving revision 1.100
diff -C2 -d -r1.99 -r1.100
*** config.py 23 Feb 2004 16:09:34 - 1.99
--- config.py 27 Feb 2004 20:10:02 - 1.100
***
*** 23,26
--- 23,29
# ---
# $Log$
+ # Revision 1.100 2004/02/27 20:10:02 dischi
+ # helper function to check if an object is some sort of string
+ #
# Revision 1.99 2004/02/23 16:09:34 dischi
# make it possible to print unicode
***
*** 31,35
# Revision 1.97 2004/02/19 04:57:55 gsbarbieri
# Support Web Interface i18n.
- # To use this, I need to get the gettext() translations in unicode, so some changes
are required to files that use "print _('string')", need to make them "print
String(_('string'))".
#
# Revision 1.96 2004/02/08 19:53:14 dischi
--- 34,37
***
*** 53,71
# like "pt_BR.UTF-8"
#
- # Revision 1.92 2004/01/17 20:30:18 dischi
- # use new metainfo
- #
- # Revision 1.91 2004/01/10 13:12:02 dischi
- # create disc and disc-set dirs in OVERLAY_DIR
- #
- # Revision 1.90 2004/01/10 04:30:32 outlyer
- # Newer versions of twisted print this message:
- # "/usr/lib/python2.3/site-packages/freevo/helpers/webserver.py:106:
- # exceptions.DeprecationWarning: twisted.internet.app is deprecated,
- # use twisted.application instead."
- #
- # Which is nice to know, but is non-trivial to implement so let's not see
- # it every time we start an app.
- #
# ---
# Freevo - A Home Theater PC framework
--- 55,58
***
*** 113,121
- # add True and False to __builtin__ for older python versions
- if float(sys.version[0:3]) < 2.3:
- __builtin__.__dict__['True'] = 1
- __builtin__.__dict__['False'] = 0
-
# temp solution until this is fixed to True and False
# in all freevo modules
--- 100,103
***
*** 124,127
--- 106,117
+ # String helper function. Always use this function to detect if the
+ # object is a string or not. It checks against str and unicode
+ def __isstring__(s):
+ return isinstance(s, str) or isinstance(s, unicode)
+
+ __builtin__.__dict__['isstring'] = __isstring__
+
+
class Logger:
"""
***
*** 587,591
abs = []
for d in x:
! if isinstance(d, str):
abs.append(os.path.abspath(d))
else:
--- 577,581
abs = []
for d in x:
! if isstring(d):
abs.append(os.path.abspath(d))
else:
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util misc.py,1.32,1.33
Update of /cvsroot/freevo/freevo/src/util
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32382
Modified Files:
misc.py
Log Message:
add function to check for identical string beginnings
Index: misc.py
===
RCS file: /cvsroot/freevo/freevo/src/util/misc.py,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** misc.py 23 Feb 2004 19:59:35 - 1.32
--- misc.py 27 Feb 2004 20:08:42 - 1.33
***
*** 11,14
--- 11,17
# ---
# $Log$
+ # Revision 1.33 2004/02/27 20:08:42 dischi
+ # add function to check for identical string beginnings
+ #
# Revision 1.32 2004/02/23 19:59:35 dischi
# unicode fixes
***
*** 33,101
# better directory name building
#
- # Revision 1.25 2004/02/07 13:07:55 dischi
- # fix unicode/encoding problem with sqlite
- #
- # Revision 1.24 2004/02/07 11:54:29 dischi
- # handle html code as unicode
- #
- # Revision 1.23 2004/02/05 19:26:42 dischi
- # fix unicode handling
- #
- # Revision 1.22 2004/02/05 05:44:26 gsbarbieri
- # Fixes some bugs related to handling unicode internally.
- # NOTE: Many of the bugs are related to using str() everywhere, so please stop doing
that.
- #
- # Revision 1.21 2004/02/01 17:06:12 dischi
- # speedup
- #
- # Revision 1.20 2004/01/24 19:00:40 dischi
- # usb storage device support
- #
- # Revision 1.19 2004/01/13 15:18:19 outlyer
- # Check every ten minutes... it's still barely noticeable, but keeps the
- # screen up to date... 30 minutes would work too, but then we'd have to
- # make sure we check at the top of every hour to keep it inline.
- #
- # Revision 1.18 2004/01/11 17:04:15 outlyer
- # Until \t is fixed, this '-' at least provides some indentation to make it
- # easier to read the list. (I used this in the screenshot I took last night)
- #
- # Revision 1.17 2004/01/11 10:56:52 dischi
- # Fixes in comingup:
- # o do not crash when the recordserver is down
- # o show a message when no schedules are set and not nothing
- # o make arg optional (why is it there anyway?)
- #
- # Revision 1.16 2004/01/11 05:59:41 outlyer
- # How overcomplicated could I have made something so simple? This is a little
- # embarassing. I think this "algorithm" is less dumb.
- #
- # Revision 1.12 2004/01/01 16:18:11 dischi
- # fix crash
- #
- # Revision 1.11 2003/12/31 16:43:49 dischi
- # major speed enhancements
- #
- # Revision 1.10 2003/12/30 22:30:50 dischi
- # major speedup in vfs using
- #
- # Revision 1.9 2003/12/29 22:31:56 dischi
- # no need to check image
- #
- # Revision 1.8 2003/12/12 19:20:07 dischi
- # check images
- #
- # Revision 1.7 2003/12/10 19:47:12 dischi
- # remove unneeded imports
- #
- # Revision 1.6 2003/11/23 16:57:36 dischi
- # move xml help stuff to new fxdparser
- #
- # 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
--- 36,39
***
*** 328,331
--- 266,270
+
def format_text(text):
while len(text) and text[0] in (' ', '\t', '\n'):
***
*** 374,377
--- 313,348
return cmp(m.upper(),n.upper()) # be case insensitive
+
+ def find_start_string(s1, s2):
+ """
+ Find similar start in both strings
+ """
+ ret = ''
+ tmp = ''
+ while True:
+ if len(s1) < 2 or len(s2) < 2:
+ return ret
+ if s1[0] == s2[0]:
+ tmp += s2[0]
+ if s1[1] in (u' ', u'-', u'_', u',', u':', '.') and \
+s2[1] in (u' ', u'-', u'_', u',', u':', '.'):
+ ret += tmp + u' '
+ tmp = ''
+ s1 = s1[1:].lstrip(u' -_,:.')
+ s2 = s2[1:].lstrip(u' -_,:.')
+ else:
+ return ret
+
+ def remove_start_string(string, start):
+ """
+ remove start from the beginning of string.
+ """
+ start = start.replace(u' ', '')
+ for i in range(len(start)):
+ string = string[1:].lstrip(' -_,:.')
+
+ return string[0].upper() + string[1:]
+
+
def tagmp3 (filename, title=None, artist=None, album=None, track=None,
tracktotal=None, year=None):
***
*** 483,489
if m.sub_title:
sub_title = u' "' + Unicode(m.sub_title) + u'" '
! result = result + u"- %s%s at %s\n" % ( Unicode(m.title),
! Unicode(sub_title),
!
Unicode(time.strftime('%I:%M%p',time.localtime(m.start))) )
if len(tomorrow) > 0:
--- 454,460
if m.sub_title:
[Freevo-cvslog] freevo/src/plugins rom_drives.py,1.57,1.58
Update of /cvsroot/freevo/freevo/src/plugins
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32087/plugins
Modified Files:
rom_drives.py
Log Message:
add function to check if a media is mounted
Index: rom_drives.py
===
RCS file: /cvsroot/freevo/freevo/src/plugins/rom_drives.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -C2 -d -r1.57 -r1.58
*** rom_drives.py 15 Feb 2004 15:29:47 - 1.57
--- rom_drives.py 27 Feb 2004 20:07:28 - 1.58
***
*** 10,13
--- 10,16
# ---
# $Log$
+ # Revision 1.58 2004/02/27 20:07:28 dischi
+ # add function to check if a media is mounted
+ #
# Revision 1.57 2004/02/15 15:29:47 dischi
# remove old stuff
***
*** 381,385
Mount the media
"""
! _debug_('Mounting disc in drive %s' % self.drivename,2)
util.mount(self.mountdir, force=True)
return
--- 384,388
Mount the media
"""
! _debug_('Mounting disc in drive %s' % self.drivename, 2)
util.mount(self.mountdir, force=True)
return
***
*** 390,397
Mount the media
"""
! _debug_('Unmounting disc in drive %s' % self.drivename,2)
util.umount(self.mountdir)
return
!
def shutdown(self):
shutdown()
--- 393,408
Mount the media
"""
! _debug_('Unmounting disc in drive %s' % self.drivename, 2)
util.umount(self.mountdir)
return
!
!
! def is_mounted(self):
! """
! Check if the media is mounted
! """
! return util.is_mounted(self.mountdir)
!
!
def shutdown(self):
shutdown()
---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
___
Freevo-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-cvslog] freevo/src/util fileops.py,1.15,1.16
Update of /cvsroot/freevo/freevo/src/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32087/util Modified Files: fileops.py Log Message: add function to check if a media is mounted Index: fileops.py === RCS file: /cvsroot/freevo/freevo/src/util/fileops.py,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** fileops.py 5 Feb 2004 19:26:42 - 1.15 --- fileops.py 27 Feb 2004 20:07:28 - 1.16 *** *** 11,14 --- 11,17 # --- # $Log$ + # Revision 1.16 2004/02/27 20:07:28 dischi + # add function to check if a media is mounted + # # Revision 1.15 2004/02/05 19:26:42 dischi # fix unicode handling *** *** 17,26 # Handle filenames internally as unicode objects. # - # This does *NOT* affect filenames that have only ASCII chars, since the translation ASCII -> Unicode is painless. However this *DOES* affect files with accents, like é (e acute, \xe9) and others. - # - # I tested with Video, Images and Music modules, but *NOT* with Games, so if you have the games modules, give it a try. - # - # It determines the encoding based on (in order) FREEVO_LOCALE, LANG and LC_ALL, which may have the form: "LANGUAGE_CODE.ENCODING", like "pt_BR.UTF-8", and others. - # # Revision 1.13 2004/01/16 16:23:29 dischi # add softlink checking --- 20,23 *** *** 32,64 # add helper to get all subdirs recursive # - # Revision 1.10 2003/12/31 16:43:49 dischi - # major speed enhancements - # - # Revision 1.8 2003/12/12 19:11:20 dischi - # rewrote find_matches. It's not 100% correct because it doesn't use splitext - # anymore, but it's _much_ faster now. - # - # Revision 1.7 2003/12/09 19:42:23 dischi - # more generic resolve_media_mountdir and arg checking for mount functions - # - # 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 - # - # Revision 1.4 2003/11/03 18:25:36 dischi - # fix - # - # Revision 1.3 2003/11/02 09:24:35 dischi - # Check for libs and make it possible to install runtime from within - # freevo - # - # Revision 1.2 2003/10/17 17:28:41 dischi - # bugfix - # - # 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 --- 29,32 *** *** 91,95 import fnmatch import traceback - import time if float(sys.version[0:3]) < 2.3: --- 59,62 *** *** 404,408 umount(d) ! def resolve_media_mountdir(*arg): """ --- 371,383 umount(d) ! ! def is_mounted(dir): ! """ ! return if the dir is mounted ! """ ! global mounted_dirs ! return dir in mounted_dirs ! ! def resolve_media_mountdir(*arg): """ --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-cvslog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
[Freevo-wikilog] [Freevo Wiki] Update of "FrontPage"
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Freevo Wiki" for change notification. The following page has been changed by 66.80.4.221: http://freevo.sourceforge.net/cgi-bin/moin.cgi/FrontPage -- @@ -10,7 +10,7 @@ If you have any questions, read the FrequentlyAskedQuestions. Subscribe to the [http://sourceforge.net/mail/?group_id=46652 user's mailing list] and ask questions there if you need any help! -= Docs = += Documentation = Main documentation * DocumentationPage -- Main documentation, including installation, hardware support and links to the subpages[[BR]][[BR]] --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-wikilog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-wikilog
[Freevo-wikilog] [Freevo Wiki] Update of "FrontPage"
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Freevo Wiki" for change notification. The following page has been changed by 66.80.4.221: http://freevo.sourceforge.net/cgi-bin/moin.cgi/FrontPage -- @@ -10,7 +10,7 @@ If you have any questions, read the FrequentlyAskedQuestions. Subscribe to the [http://sourceforge.net/mail/?group_id=46652 user's mailing list] and ask questions there if you need any help! -= Documentations = += Docs = Main documentation * DocumentationPage -- Main documentation, including installation, hardware support and links to the subpages[[BR]][[BR]] --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-wikilog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-wikilog
[Freevo-wikilog] [Freevo Wiki] Update of "FrontPage"
Dear Wiki user, You have subscribed to a wiki page or wiki category on "Freevo Wiki" for change notification. The following page has been changed by 66.80.4.221: http://freevo.sourceforge.net/cgi-bin/moin.cgi/FrontPage -- @@ -10,7 +10,7 @@ If you have any questions, read the FrequentlyAskedQuestions. Subscribe to the [http://sourceforge.net/mail/?group_id=46652 user's mailing list] and ask questions there if you need any help! -= Documentation = += Documentations = Main documentation * DocumentationPage -- Main documentation, including installation, hardware support and links to the subpages[[BR]][[BR]] --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-wikilog mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-wikilog
Re: [Freevo-devel] tivoguide and tvguide plugin patch
It's a ridiculous patent because it basically talks about the only possible implementation of on screen display functionality. Seeing as most of us hadn't even heard of this patent until recently, it seems like it was the "obvious" implementation, hardly an innovative idea. Every paper based TV listing I've seen uses a grid like this. On Thu, Feb 26, 2004 at 12:02:29PM -0600, Krister Lagerstrom wrote: > Aubin Paul said: > > You're probably right that this patent is uneforceable, but for the > > sake of being careful, maybe we should avoid putting into Freevo CVS > > at least until it's been looked into further. > > Reading the patent text in the previous email, we're not even allowed to > put up program information on top of the TV screen. > > I should move back to Sweden where the patent law explicitly states that > patents does not restrict private use. > > / Krister > > > --- > SF.Net is sponsored by: Speed Start Your Linux Apps Now. > Build and deploy apps & Web services for Linux with > a free DVD software kit from IBM. Click Now! > http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click > ___ > Freevo-devel mailing list > [EMAIL PROTECTED] > https://lists.sourceforge.net/lists/listinfo/freevo-devel --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-devel
Re: [Freevo-devel] Re: tivoguide and tvguide plugin patch
Dirk Meyer wrote: "Krister Lagerstrom" wrote: I should move back to Sweden where the patent law explicitly states that patents does not restrict private use. Is Sweden part of the EU? If so, that won't help. The EU is on the best (?) way to also allow stupid patents like the US does. Yes, Sweden is part of the EU since 1994. Hopefully they'll keep the part where patents doesn't apply to private use, then it doesn't matter as much if there are stupid SW patents... / Krister --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-devel
[Freevo-devel] FreeBSD update
Hi, I finally got around to trying a recent CVS version on FreeBSD, and I'm happy to report that it basically ran without further diffs. This bodes well for 1.5 under FreeBSD. I'll update the FreeBSD port once I have broadband at my new house. I've some other small patches that I'll sent then as well, mostly for running freevo in SDL using FreeBSD's vgl console library (i.e., without X11). I'm still debugging some issues wrt long delays during startup. Lars -- Lars Eggert NEC Network Laboratories smime.p7s Description: S/MIME Cryptographic Signature
[Freevo-devel] Re: tivoguide and tvguide plugin patch
"Krister Lagerstrom" wrote: > I should move back to Sweden where the patent law explicitly states that > patents does not restrict private use. Is Sweden part of the EU? If so, that won't help. The EU is on the best (?) way to also allow stupid patents like the US does. Dischi -- This is Linux country. If you listen carefully, you can hear Windows reboot... --- SF.Net is sponsored by: Speed Start Your Linux Apps Now. Build and deploy apps & Web services for Linux with a free DVD software kit from IBM. Click Now! http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click ___ Freevo-devel mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/freevo-devel
