[Openrpg-dev] openrpg1 start_server.py,1.31,1.32

[Digital X. <dig...@us...>]

Update of /cvsroot/openrpg/openrpg1
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27222

Modified Files:
	start_server.py 
Log Message:
Added the ability to auto register the server via the ini
Added the ability to change the Lobby name via the ini
Added the ability to set the server name via the ini

Index: start_server.py
===================================================================
RCS file: /cvsroot/openrpg/openrpg1/start_server.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** start_server.py	18 Feb 2007 16:14:48 -0000	1.31
--- start_server.py	13 Mar 2007 23:55:57 -0000	1.32
***************
*** 24,33 ****
  
  if __name__ == '__main__':
-     lobby_boot_pwd = ""
-     name = ""
-     post = "N"
-     opt="N"
      gc.set_debug(gc.DEBUG_UNCOLLECTABLE)
      gc.enable()
  
      # See if we have command line arguments in need of processing
--- 24,30 ----
  
  if __name__ == '__main__':
      gc.set_debug(gc.DEBUG_UNCOLLECTABLE)
      gc.enable()
+     orpg_server = orpg.networking.mplay_server.mplay_server()
  
      # See if we have command line arguments in need of processing
***************
*** 37,44 ****
              # Server Name
              if o[0] in ( "-n", ):
!                 name = o[1]
              # Post server to meta
              if o[0] in ( "-p", ):
!                 post = 'Y'
              # Lobby Password
              if o[0] in ( "-l", ):
--- 34,41 ----
              # Server Name
              if o[0] in ( "-n", ):
!                 orpg_server.name = o[1]
              # Post server to meta
              if o[0] in ( "-p", ):
!                 orpg_server.reg = 'Y'
              # Lobby Password
              if o[0] in ( "-l", ):
***************
*** 50,75 ****
          usage( 1 )
  
-     # Now, validate that if we had options passed in, they make sense!  If
-     # no options were passed in, follow the normal prompt for information
-     # start up path.  If -p is passed in, make sure name and password is
-     # also provided.
-     if len(opts):
-         if (post == 'Y') and ((len(name) == 0) or (len(lobby_boot_pwd) == 0)):
-             usage(1)
-     if (len(lobby_boot_pwd) == 0):
-         lobby_boot_pwd = raw_input("Enter boot password for the Lobby:  ")
-     # Only ask if we didn't pass in options and post isn't 'Y'
-     if ( (post == 'N') and (opt == 'N') ):
-         opt = raw_input("Do you want to post your server to the OpenRPG Meta Server list? (y,n)")
-         if len(opt) and (opt[0] == 'y' or opt[0] == 'Y'):
-             post = 'Y'
-         else:
-             post = 'N'
- 
-     # If we are going to post make sure we have a server name, if not, ask for it
-     if ( post == 'Y' ) and (len(name) == 0 ):
-         name = raw_input("Server Name?")
      # start server!
-     orpg_server = orpg.networking.mplay_server.mplay_server()
      orpg_server.force_check = 1
      orpg_server.remoteadmin = 1
--- 47,51 ----
***************
*** 79,91 ****
              orpg_server.force_check=0
  
!     if ( post == 'Y' ) and (len(name)):
!         # Start the registration thread
!         #  register servers
!         orpg_server.register( name )
      print "-----------------------------------------------------"
      print "Type 'help' or '?' or 'h' for server console commands"
      print "-----------------------------------------------------"
-     #orpg_server.print_help()
-     orpg_server.groups['0'].boot_pwd = lobby_boot_pwd
  
      opt = "None"
--- 55,82 ----
              orpg_server.force_check=0
  
!     if len(orpg_server.groups['0'].boot_pwd) != 0:
!         lobby_boot_pwd = orpg_server.groups['0'].boot_pwd
!     elif len(lobby_boot_pwd) == 0:
!         lobby_boot_pwd = raw_input("Enter boot password for the Lobby:  ")
! 
!     orpg_server.groups['0'].boot_pwd = lobby_boot_pwd
! 
!     if orpg_server.reg[0].upper() != "Y" and orpg_server.reg[0].upper() != "N":
!         opt = raw_input("Do you want to post your server to the OpenRPG Meta Server list? (y,n)")
!         if len(opt) and (opt[0].upper() == 'Y'):
!             orpg_server.reg = 'Y'
!         else:
!             orpg_server.reg = 'N'
! 
! 
!     if orpg_server.reg[0].upper() == "Y":
!         if orpg_server.name == None:
!             orpg_server.name = raw_input("Server Name?")
! 
!         orpg_server.register(orpg_server.name)
! 
      print "-----------------------------------------------------"
      print "Type 'help' or '?' or 'h' for server console commands"
      print "-----------------------------------------------------"
  
      opt = "None"