|
From: <mo...@us...> - 2007-08-29 13:42:07
|
Revision: 838
http://gmyth.svn.sourceforge.net/gmyth/?rev=838&view=rev
Author: morphbr
Date: 2007-08-29 06:42:10 -0700 (Wed, 29 Aug 2007)
Log Message:
-----------
- Arranged code in a better way
Modified Paths:
--------------
trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
Added Paths:
-----------
trunk/gmyth-stream/server/data/
trunk/gmyth-stream/server/debian/
trunk/gmyth-stream/server/gms.py
trunk/gmyth-stream/server/html/
trunk/gmyth-stream/server/lib/
trunk/gmyth-stream/server/plugins/
trunk/gmyth-stream/server/server.conf
trunk/gmyth-stream/server/setup.py
Removed Paths:
-------------
trunk/gmyth-stream/server/0.3/
Copied: trunk/gmyth-stream/server/data (from rev 836, trunk/gmyth-stream/server/0.3/data)
Copied: trunk/gmyth-stream/server/debian (from rev 836, trunk/gmyth-stream/server/0.3/debian)
Copied: trunk/gmyth-stream/server/gms.py (from rev 836, trunk/gmyth-stream/server/0.3/gms.py)
===================================================================
--- trunk/gmyth-stream/server/gms.py (rev 0)
+++ trunk/gmyth-stream/server/gms.py 2007-08-29 13:42:10 UTC (rev 838)
@@ -0,0 +1,74 @@
+#!/usr/bin/env python
+
+__author__ = "Artur Duque de Souza"
+__author_email__ = "art...@in..."
+__license__ = "GPL"
+__version__ = "0.3"
+__thanks__ = "Gustavo Sverzut Barbieri"
+__GMS_DATA_DIR__ = "/usr/share/gms/"
+
+import sys
+import os
+import mimetypes
+import logging as log
+
+if os.path.exists (__GMS_DATA_DIR__):
+ sys.path.append(__GMS_DATA_DIR__)
+
+from lib.server import serve_forever, load_plugins_transcoders
+from lib.utils import config
+
+mimetypes.init()
+log_level = log.INFO
+for p in sys.argv[1:]:
+ if p == "-v" or p == "--verbose":
+ log_level -= 10
+
+log.basicConfig(level=log_level,
+ format=("### %(asctime)s %(name)-18s \t%(levelname)-8s "
+ "\t%(message)s"),
+ datefmt="%Y-%m-%d %H:%M:%S")
+
+if config.get_transcoded_location () is None:
+ print "Gms not configured"
+ exit (0)
+
+if not os.path.exists(config.get_transcoded_location()):
+ os.mkdir(config.get_transcoded_location())
+
+
+if "-d" in sys.argv:
+ #run with deamon
+ try:
+ pid = os.fork()
+ if pid > 0:
+ sys.exit(0)
+ except OSError, e:
+ print >>sys.stderr, "Fail to start deamon: %d (%s)" % (e.errno, e.strerror)
+ sys.exit(1)
+
+ os.chdir("/")
+ os.setsid()
+ os.umask(0)
+
+ try:
+ pid = os.fork()
+ if pid > 0:
+ fp = open ("/var/run/gms.pid", "w")
+ fp.write ("%d" % pid)
+ fp.close ()
+ sys.exit(0)
+ except OSError, e:
+ print >>sys.stderr, "Fail to start deamon: %d (%s)" % (e.errno, e.strerror)
+ sys.exit(1)
+
+# main deamon
+pd = os.path.join(__GMS_DATA_DIR__, "plugins", "transcoders")
+if os.path.exists (pd):
+ load_plugins_transcoders(pd)
+
+pd = os.path.join("plugins", "transcoders");
+if os.path.exists (pd):
+ load_plugins_transcoders(pd)
+
+serve_forever()
Copied: trunk/gmyth-stream/server/html (from rev 836, trunk/gmyth-stream/server/0.3/html)
Copied: trunk/gmyth-stream/server/lib (from rev 836, trunk/gmyth-stream/server/0.3/lib)
Copied: trunk/gmyth-stream/server/plugins (from rev 836, trunk/gmyth-stream/server/0.3/plugins)
Modified: trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py
===================================================================
--- trunk/gmyth-stream/server/0.3/plugins/transcoders/gmencoder.py 2007-08-29 09:00:25 UTC (rev 836)
+++ trunk/gmyth-stream/server/plugins/transcoders/gmencoder.py 2007-08-29 13:42:10 UTC (rev 838)
@@ -98,7 +98,7 @@
if not outfile:
ret = p.poll(0)
if ret:
- print "Lost Connection"
+ self.log.info(self.tid, "Lost connection")
self.stop ()
return False
Copied: trunk/gmyth-stream/server/server.conf (from rev 836, trunk/gmyth-stream/server/0.3/server.conf)
===================================================================
--- trunk/gmyth-stream/server/server.conf (rev 0)
+++ trunk/gmyth-stream/server/server.conf 2007-08-29 13:42:10 UTC (rev 838)
@@ -0,0 +1,2 @@
+[PATHS]
+transcoded=./.transcoded
Copied: trunk/gmyth-stream/server/setup.py (from rev 836, trunk/gmyth-stream/server/0.3/setup.py)
===================================================================
--- trunk/gmyth-stream/server/setup.py (rev 0)
+++ trunk/gmyth-stream/server/setup.py 2007-08-29 13:42:10 UTC (rev 838)
@@ -0,0 +1,17 @@
+from distutils.core import setup
+from glob import glob
+
+setup(name='gms',
+ version='0.6',
+ description='carman rich view package',
+ long_description='carman rich view (SDL based) package',
+ url='http://www.indt.org.br',
+ scripts=['gms.py'],
+ package_dir={'lib': 'lib', 'plugins' : 'plugins','data' : 'data' },
+ packages=['lib','plugins','plugins.transcoders','plugins.transcoders.mencoder_lib'],
+ data_files = [
+ ('share/gms/html', glob("html/*")),
+ ('etc/init.d', ['data/gmsd']),
+ ('etc/gms', ['data/server.conf'])
+ ],
+ )
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|