From owner-p4-projects@FreeBSD.ORG Sun Jul 8 06:24:50 2007 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 225AB16A46C; Sun, 8 Jul 2007 06:24:50 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id C7B9F16A400 for ; Sun, 8 Jul 2007 06:24:49 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41]) by mx1.freebsd.org (Postfix) with ESMTP id B498013C4B9 for ; Sun, 8 Jul 2007 06:24:49 +0000 (UTC) (envelope-from andrew@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.8/8.13.8) with ESMTP id l686OnfG040800 for ; Sun, 8 Jul 2007 06:24:49 GMT (envelope-from andrew@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.8/8.13.8/Submit) id l686OnPk040797 for perforce@freebsd.org; Sun, 8 Jul 2007 06:24:49 GMT (envelope-from andrew@freebsd.org) Date: Sun, 8 Jul 2007 06:24:49 GMT Message-Id: <200707080624.l686OnPk040797@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to andrew@freebsd.org using -f From: Andrew Turner To: Perforce Change Reviews Cc: Subject: PERFORCE change 123090 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Jul 2007 06:24:50 -0000 http://perforce.freebsd.org/chv.cgi?CH=123090 Change 123090 by andrew@andrew_hermies on 2007/07/08 06:24:02 Add a Directory class to define a base directory within a computer Allow calls to be sent to the back end Fix a typo Affected files ... .. //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#3 edit Differences ... ==== //depot/projects/soc2007/andrew-update/frontend/facund/computer.py#3 (text+ko) ==== @@ -28,6 +28,20 @@ import facund.network import threading +class Directory: + def __init__(self, name, computer): + self.__name = name + self.__computer = computer + + def getName(self): + return self.__name + + def getCommands(self): + return self.__computer.getCommands(self.__name) + + def runCommand(self, position): + return self.__computer.runCommand(position, self.__name) + class Computer(threading.Thread): '''A class to describe each computer able to be connected to''' def __init__(self, name, host): @@ -37,13 +51,14 @@ self.__dirs = [] self.__connected = False self.__connection = None + self.__commands = ['Avaliable', 'Downloaded', 'Installed'] def __str__(self): return self.__name + ": " + self.__host def addDir(self, dir): '''Adds a directory to the avaliable directories to update''' - self.__dirs.append(dir) + self.__dirs.append(facund.Directory(dir, self)) def getConnectionStatus(self): '''Returns the connection state''' @@ -54,13 +69,35 @@ return self.__dirs def getName(self): - '''Returns the Human redable name for the computer''' + '''Returns the Human readable name for the computer''' return self.__name def getHost(self): '''Returns the hostname/ip of the computer''' return self.__host + def getCommands(self, dir): + return self.__commands + + def runCommand(self, command, dir = None): + print self.__commands[command] + if self.__commands[command] == 'Avaliable': + return self.getUpdateList(dir) + else: + print 'TODO: Handle this command (%d)' % (command,); + + def getUpdateList(self, dir = None): + if dir is None: + for dir in self.__dirs: + args = None + else: + args = facund.Array() + args.append(facund.String("base")) + args.append(facund.String(dir)) + + call = facund.Call("list_updates", args) + self.__connection.doCall(call) + def connect(self): '''Connects to the remote computer''' if self.__connection is not None: