Update of /cvsroot/freevo/freevo/src/helpers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8388/src/helpers
Modified Files:
convert_config.py
Log Message:
renamed SKIN_* and OSD_* variables to GUI_*
Index: convert_config.py
===================================================================
RCS file: /cvsroot/freevo/freevo/src/helpers/convert_config.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** convert_config.py 30 Nov 2003 16:30:58 -0000 1.4
--- convert_config.py 31 Dec 2004 11:57:42 -0000 1.5
***************
*** 4,39 ****
import util
change_map = {
! 'DIR_MOVIES': 'VIDEO_ITEMS',
! 'DIR_AUDIO' : 'AUDIO_ITEMS',
! 'DIR_IMAGES': 'IMAGE_ITEMS',
! 'DIR_GAMES' : 'GAMES_ITEMS',
! 'DIR_RECORD': 'TV_RECORD_DIR',
! 'SUFFIX_VIDEO_FILES': 'VIDEO_SUFFIX',
! 'SUFFIX_VIDEO_MPLAYER_FILES': 'VIDEO_MPLAYER_SUFFIX',
! 'SUFFIX_VIDEO_XINE_FILES': 'VIDEO_XINE_SUFFIX',
! 'ONLY_SCAN_DATADIR': 'VIDEO_ONLY_SCAN_DATADIR',
! 'SUFFIX_AUDIO_FILES': 'AUDIO_SUFFIX',
! 'SUFFIX_AUDIO_PLAYLISTS': 'PLAYLIST_SUFFIX',
! 'SUFFIX_IMAGE_FILES': 'IMAGE_SUFFIX',
! 'SUFFIX_IMAGE_SSHOW': 'IMAGE_SSHOW_SUFFIX',
! 'MAME_CACHE': 'GAMES_MAME_CACHE',
! 'OSD_SKIN': 'SKIN_MODULE',
! 'FORCE_SKIN_LAYOUT': 'DIRECTORY_FORCE_SKIN_LAYOUT',
! 'AUDIO_FORMAT_STRING': 'DIRECTORY_AUDIO_FORMAT_STRING',
! 'USE_MEDIAID_TAG_NAMES': 'DIRECTORY_USE_MEDIAID_TAG_NAMES',
! 'OVERSCAN_X': 'OSD_OVERSCAN_X',
! 'OVERSCAN_Y': 'OSD_OVERSCAN_Y',
! 'TV_SHOW_DATA_DIR': 'VIDEO_SHOW_DATA_DIR',
! 'TV_SHOW_REGEXP': 'VIDEO_SHOW_REGEXP',
! 'TV_SHOW_REGEXP_MATCH': 'VIDEO_SHOW_REGEXP_MATCH',
! 'TV_SHOW_REGEXP_SPLIT': 'VIDEO_SHOW_REGEXP_SPLIT',
! 'STOP_OSD_WHEN_PLAYING': 'OSD_STOP_WHEN_PLAYING',
! 'RECORD_SCHEDULE': 'TV_RECORD_SCHEDULE',
! 'RECORD_SERVER_IP': 'TV_RECORD_SERVER_IP',
! 'RECORD_SERVER_PORT': 'TV_RECORD_SERVER_PORT',
! 'RECORD_PADDING': 'TV_RECORD_PADDING',
! 'IVTV_OPTIONS': 'TV_IVTV_OPTIONS',
! 'VCR_SETTINGS': 'TV_VCR_SETTINGS',
}
--- 4,60 ----
import util
+ # change_map = {
+ # 'DIR_MOVIES': 'VIDEO_ITEMS',
+ # 'DIR_AUDIO' : 'AUDIO_ITEMS',
+ # 'DIR_IMAGES': 'IMAGE_ITEMS',
+ # 'DIR_GAMES' : 'GAMES_ITEMS',
+ # 'DIR_RECORD': 'TV_RECORD_DIR',
+ # 'SUFFIX_VIDEO_FILES': 'VIDEO_SUFFIX',
+ # 'SUFFIX_VIDEO_MPLAYER_FILES': 'VIDEO_MPLAYER_SUFFIX',
+ # 'SUFFIX_VIDEO_XINE_FILES': 'VIDEO_XINE_SUFFIX',
+ # 'ONLY_SCAN_DATADIR': 'VIDEO_ONLY_SCAN_DATADIR',
+ # 'SUFFIX_AUDIO_FILES': 'AUDIO_SUFFIX',
+ # 'SUFFIX_AUDIO_PLAYLISTS': 'PLAYLIST_SUFFIX',
+ # 'SUFFIX_IMAGE_FILES': 'IMAGE_SUFFIX',
+ # 'SUFFIX_IMAGE_SSHOW': 'IMAGE_SSHOW_SUFFIX',
+ # 'MAME_CACHE': 'GAMES_MAME_CACHE',
+ # 'OSD_SKIN': 'SKIN_MODULE',
+ # 'FORCE_SKIN_LAYOUT': 'DIRECTORY_FORCE_SKIN_LAYOUT',
+ # 'AUDIO_FORMAT_STRING': 'DIRECTORY_AUDIO_FORMAT_STRING',
+ # 'USE_MEDIAID_TAG_NAMES': 'DIRECTORY_USE_MEDIAID_TAG_NAMES',
+ # 'OVERSCAN_X': 'OSD_OVERSCAN_X',
+ # 'OVERSCAN_Y': 'OSD_OVERSCAN_Y',
+ # 'TV_SHOW_DATA_DIR': 'VIDEO_SHOW_DATA_DIR',
+ # 'TV_SHOW_REGEXP': 'VIDEO_SHOW_REGEXP',
+ # 'TV_SHOW_REGEXP_MATCH': 'VIDEO_SHOW_REGEXP_MATCH',
+ # 'TV_SHOW_REGEXP_SPLIT': 'VIDEO_SHOW_REGEXP_SPLIT',
+ # 'STOP_OSD_WHEN_PLAYING': 'OSD_STOP_WHEN_PLAYING',
+ # 'RECORD_SCHEDULE': 'TV_RECORD_SCHEDULE',
+ # 'RECORD_SERVER_IP': 'TV_RECORD_SERVER_IP',
+ # 'RECORD_SERVER_PORT': 'TV_RECORD_SERVER_PORT',
+ # 'RECORD_PADDING': 'TV_RECORD_PADDING',
+ # 'IVTV_OPTIONS': 'TV_IVTV_OPTIONS',
+ # 'VCR_SETTINGS': 'TV_VCR_SETTINGS',
+ # }
+
change_map = {
! 'SKIN_XML_FILE': 'GUI_XML_FILE',
! 'SKIN_DEFAULT_XML_FILE': 'GUI_DEFAULT_XML_FILE',
! 'SKIN_FORCE_TEXTVIEW_STYLE': 'GUI_FORCE_TEXTVIEW_STYLE',
! 'SKIN_MEDIAMENU_FORCE_TEXTVIEW': 'GUI_MEDIAMENU_FORCE_TEXTVIEW',
! 'OSD_DEFAULT_FONTNAME': 'GUI_FONT_DEFAULT_NAME',
! 'OSD_DEFAULT_FONTSIZE': 'GUI_FONT_DEFAULT_SIZE',
! 'OSD_EXTRA_FONT_PATH': 'GUI_FONT_PATH',
! 'OSD_FONT_ALIASES': 'GUI_FONT_ALIASES',
! 'OSD_BUSYICON_TIMER': 'GUI_BUSYICON_TIMER',
! 'OSD_SDL_EXEC_AFTER_STARTUP': 'GUI_SDL_EXEC_AFTER_STARTUP',
! 'OSD_SDL_EXEC_AFTER_CLOSE': 'GUI_SDL_EXEC_AFTER_CLOSE',
! 'OSD_OVERSCAN_X': 'GUI_OVERSCAN_X',
! 'OSD_OVERSCAN_Y': 'GUI_OVERSCAN_Y',
! 'OSD_STOP_WHEN_PLAYING': 'GUI_STOP_WHEN_PLAYING',
! 'OSD_DISPLAY': 'GUI_DISPLAY',
! 'OSD_BACKGROUND_VIDEO': 'GUI_BACKGROUND_VIDEO',
! 'OSD_FADE_STEPS': 'GUI_FADE_STEPS',
! 'TV_RECORDFILE_MASK': 'TV_RECORD_FILEMASK'
}
***************
*** 42,50 ****
print 'usage: convert_config local_conf.py [ -w ]'
print
! print 'if -w is given the local_conf.py wil be rewritten, without the
option'
! print 'the script will only print the changes.'
print
! print 'Developer may use the option -s (without local_conf) to scan for
files'
! print 'which use the deleted variables'
print
sys.exit(0)
--- 63,71 ----
print 'usage: convert_config local_conf.py [ -w ]'
print
! print 'if -w is given the local_conf.py wil be rewritten, without the'
! print 'option the script will only print the changes.'
print
! print 'Developer may use the option -s (without local_conf) to scan for'
! print 'files which use the deleted variables'
print
sys.exit(0)
***************
*** 53,96 ****
! seperator = ' #=[]{}().:,\n'
! def change(file, print_name=False):
out = None
try:
cfg = open(file)
! except:
help()
data = cfg.readlines()
cfg.close()
! if len(sys.argv) == 3 and sys.argv[2] == '-w':
print 'write output file %s' % file
out = open(file, 'w')
! change = True
! if file == 'freevo_config.py':
! change = False
!
for line in data:
- if line.startswith('FREEVO_CONF_VERSION'):
- change = True
-
- if not change:
- if out:
- out.write(line)
- continue
-
for var in change_map:
if line.find(var) >= 0 and \
! (line.startswith(var) or line[line.find(var)-1] in seperator)
and \
! line[line.find(var)+len(var)] in seperator:
! if print_name:
print '**** %s **** ' % file
print_name = False
if out:
line = line.replace(var, change_map[var])
! else:
! print 'changing config file line:'
print line[:-1]
print line[:-1].replace(var, change_map[var])
--- 74,115 ----
! seperator = ' #=[]{}().:,\n+'
! def change(file, print_name=False, write_output=False):
! if file.find('convert_config.py') >= 0:
! return
!
out = None
try:
cfg = open(file)
! except Exception, e:
! print e
help()
+ debug = True
+ if len(sys.argv) == 3 and sys.argv[2] == '-w':
+ debug = False
+
data = cfg.readlines()
cfg.close()
! if write_output:
print 'write output file %s' % file
out = open(file, 'w')
! found = False
for line in data:
for var in change_map:
if line.find(var) >= 0 and \
! (line.startswith(var) or line[line.find(var)-1] in seperator) \
! and line[line.find(var)+len(var)] in seperator:
! found = True
! if print_name and debug:
print '**** %s **** ' % file
print_name = False
if out:
line = line.replace(var, change_map[var])
! elif debug:
! print 'changing line:'
print line[:-1]
print line[:-1].replace(var, change_map[var])
***************
*** 102,106 ****
out.close()
!
--- 121,127 ----
out.close()
! if found and not write_output and len(sys.argv) == 3 and \
! sys.argv[2] == '-w':
! change(file, False, True)
***************
*** 117,121 ****
# print
# print 'starting scanning all files in detail:'
! for f in util.match_files_recursively('src', [ 'py', 'rpy' ]):
change(f, print_name=True)
sys.exit(0)
--- 138,143 ----
# print
# print 'starting scanning all files in detail:'
! for f in [ 'freevo_config.py', 'local_conf.py','local_conf.py.example' ]
+\
! util.match_files_recursively('src', [ 'py' ]):
change(f, print_name=True)
sys.exit(0)
-------------------------------------------------------
The SF.Net email is sponsored by: Beat the post-holiday blues
Get a FREE limited edition SourceForge.net t-shirt from ThinkGeek.
It's fun and FREE -- well, almost....http://www.thinkgeek.com/sfshirt
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
