Author: duncan
Date: Tue Jan 8 17:05:08 2008
New Revision: 10271
Log:
[ 1865522 ] Make option for encodingcore to save to a encoded directory
Patch from Jonathan Isom added
Modified:
branches/rel-1-7/freevo/ChangeLog
branches/rel-1-7/freevo/freevo_config.py
branches/rel-1-7/freevo/src/encodingcore.py
branches/rel-1/freevo/ChangeLog
branches/rel-1/freevo/freevo_config.py
branches/rel-1/freevo/src/encodingcore.py
Modified: branches/rel-1-7/freevo/ChangeLog
==============================================================================
--- branches/rel-1-7/freevo/ChangeLog (original)
+++ branches/rel-1-7/freevo/ChangeLog Tue Jan 8 17:05:08 2008
@@ -21,6 +21,7 @@
* New web-server modules to show guidechannel and encoding_web (F#1864652)
* New Youtube video plug-in (F#1864496)
* Updated cdbackup plug-in with CD_RIP_FMT to set the encoding format
(F#1857460)
+ * Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
* Updated shut down to allow single key confirmation (F#1857456)
Modified: branches/rel-1-7/freevo/freevo_config.py
==============================================================================
--- branches/rel-1-7/freevo/freevo_config.py (original)
+++ branches/rel-1-7/freevo/freevo_config.py Tue Jan 8 17:05:08 2008
@@ -342,6 +342,7 @@
'''),
(5.22,
''' Renamed audio plug-in audio.playlist to audio.playlists
+ Added ENCODINGSERVER_SAVE_DIR for re-encoded DVDs
'''),
]
Modified: branches/rel-1-7/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1-7/freevo/src/encodingcore.py (original)
+++ branches/rel-1-7/freevo/src/encodingcore.py Tue Jan 8 17:05:08 2008
@@ -134,7 +134,13 @@
return 'Unknown container format'
self.container = container
- self.output = ('%s.%s' % (self.output, self.container))
+ if hasattr(config, 'ENCODINGSERVER_SAVE_DIR') and
config.ENCODINGSERVER_SAVE_DIR:
+ if not os.path.exists(config.ENCODINGSERVER_SAVE_DIR):
+ os.makedirs(self.ENCODINGSERVER_SAVE_DIR,
stat.S_IMODE(os.stat(config.FREEVO_CACHEDIR)[stat.ST_MODE]))
+ self.output = os.path.basename(self.output)
+ self.output = ('%s/%s.%s' % (config.ENCODINGSERVER_SAVE_DIR,
self.output, self.container))
+ else:
+ self.output = ('%s.%s' % (self.output, self.container))
def getContainerList(self):
"""Return a list of possible containers"""
Modified: branches/rel-1/freevo/ChangeLog
==============================================================================
--- branches/rel-1/freevo/ChangeLog (original)
+++ branches/rel-1/freevo/ChangeLog Tue Jan 8 17:05:08 2008
@@ -24,6 +24,7 @@
* New web-server modules to show guidechannel and encoding_web (F#1864652)
* New Youtube video plug-in (F#1864496)
* Updated cdbackup plug-in with CD_RIP_FMT to set the encoding format
(F#1857460)
+ * Updated encoding server to save the output to ENCODINGSERVER_SAVE_DIR when
set (F#1865522)
* Updated recordings manager plug-in to add thumbnail support (F#1857397)
* Updated recordserver to default watched/keep status (F#1857395)
* Updated shut down to allow single key confirmation (F#1857456)
Modified: branches/rel-1/freevo/freevo_config.py
==============================================================================
--- branches/rel-1/freevo/freevo_config.py (original)
+++ branches/rel-1/freevo/freevo_config.py Tue Jan 8 17:05:08 2008
@@ -343,6 +343,7 @@
(5.22,
'''Added RECORDSERVER_SECRET and RECORDSERVER_PORT2=18002 for kaa.rpc
Renamed audio plug-in audio.playlist to audio.playlists
+ Added ENCODINGSERVER_SAVE_DIR for re-encoded DVDs
'''),
]
Modified: branches/rel-1/freevo/src/encodingcore.py
==============================================================================
--- branches/rel-1/freevo/src/encodingcore.py (original)
+++ branches/rel-1/freevo/src/encodingcore.py Tue Jan 8 17:05:08 2008
@@ -134,7 +134,13 @@
return 'Unknown container format'
self.container = container
- self.output = ('%s.%s' % (self.output, self.container))
+ if hasattr(config, 'ENCODINGSERVER_SAVE_DIR') and
config.ENCODINGSERVER_SAVE_DIR:
+ if not os.path.exists(config.ENCODINGSERVER_SAVE_DIR):
+ os.makedirs(self.ENCODINGSERVER_SAVE_DIR,
stat.S_IMODE(os.stat(config.FREEVO_CACHEDIR)[stat.ST_MODE]))
+ self.output = os.path.basename(self.output)
+ self.output = ('%s/%s.%s' % (config.ENCODINGSERVER_SAVE_DIR,
self.output, self.container))
+ else:
+ self.output = ('%s.%s' % (self.output, self.container))
def getContainerList(self):
"""Return a list of possible containers"""
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
