yet more refactoring

git-svn-id: http://mediamods.com/public-svn/camera-activity/Record.activity@789 574bc980-5f2d-0410-acbc-c8f9f0eb14e0

1 files changed, 29 insertions, 34 deletions

diff --git a/recordtube.py b/recordtube.py
index d57d6be..2b8fd2d 100644
--- a/recordtube.py
+++ b/recordtube.py
@@ -1,14 +1,11 @@
-#todo: access these same vars from the acitivity subclass
-SERVICE = "org.laptop.RecordActivity"
-IFACE = SERVICE
-PATH = "/org/laptop/RecordActivity"
-
 import gobject
 from dbus import Interface
 from dbus.service import method, signal
 from dbus.gobject_service import ExportedGObject
 import os
 
+from constants import Constants
+
 class RecordTube(ExportedGObject):
 
 	__gsignals__ = {
@@ -23,49 +20,47 @@ class RecordTube(ExportedGObject):
 	}
 
 
-	def __init__(self, tube, myHashKey, logger):
-		super(RecordTube, self).__init__(tube, PATH)
+	def __init__(self, tube):
+		super(RecordTube, self).__init__(tube, Constants.PATH)
 		self.tube = tube
-		self.myHashKey = myHashKey
-		self._logger = logger
 
-		self.idNotify = self.tube.add_signal_receiver(self._newRecdTubeCb, 'notifyBudsOfNewRecd', IFACE, path=PATH, sender_keyword='sender')
-		self.idRequest = self.tube.add_signal_receiver(self._reqRecdTubeCb, 'requestRecdBits', IFACE, path=PATH, sender_keyword='sender')
-		self.idBroadcast = self.tube.add_signal_receiver(self._getRecdTubeCb, 'broadcastRecdBits', IFACE, path=PATH, sender_keyword='sender', byte_arrays=True)
-		self.idUnavailable = self.tube.add_signal_receiver(self._unavailableRecdTubeCb, 'unavailableRecd', IFACE, path=PATH, sender_keyword='sender')
+		self.idNotify = self.tube.add_signal_receiver(self._newRecdTubeCb, 'notifyBudsOfNewRecd', Constants.IFACE, path=Constants.PATH, sender_keyword='sender')
+		self.idRequest = self.tube.add_signal_receiver(self._reqRecdTubeCb, 'requestRecdBits', Constants.IFACE, path=Constants.PATH, sender_keyword='sender')
+		self.idBroadcast = self.tube.add_signal_receiver(self._getRecdTubeCb, 'broadcastRecdBits', Constants.IFACE, path=Constants.PATH, sender_keyword='sender', byte_arrays=True)
+		self.idUnavailable = self.tube.add_signal_receiver(self._unavailableRecdTubeCb, 'unavailableRecd', Constants.IFACE, path=Constants.PATH, sender_keyword='sender')
 
 
-	@signal(dbus_interface=IFACE, signature='ss') #dual s for 2x strings
+	@signal(dbus_interface=Constants.IFACE, signature='ss') #dual s for 2x strings
 	def notifyBudsOfNewRecd(self, recorder, recdXml):
-		self._logger.debug('Ive taken a new pho-ideo-audio!  I hereby send you an xml thumb of said media via this interface.')
+		record.log.debug('Ive taken a new pho-ideo-audio!  I hereby send you an xml thumb of said media via this interface.')
 
 
 	def _newRecdTubeCb(self, recorder, recdXml, sender=None):
-		self._logger.debug("_newRecdTubeCb from " + recorder )
+		record.log.debug("_newRecdTubeCb from " + recorder )
 		if sender == self.tube.get_unique_name():
-			self._logger.debug("_newRecdTubeCb: sender is my bus name, so ignore my own signal")
+			record.log.debug("_newRecdTubeCb: sender is my bus name, so ignore my own signal")
 			return
 		elif (recorder == self.myHashKey):
-			self._logger.debug('_newRecdTubeCb: excuse me?  you are asking me to share a photo with myself?')
+			record.log.debug('_newRecdTubeCb: excuse me?  you are asking me to share a photo with myself?')
 			return
 
 		self.emit( "new-recd", str(recorder), str(recdXml) )
 
 
-	@signal(dbus_interface=IFACE, signature='sss') #triple s for 3x strings
+	@signal(dbus_interface=Constants.IFACE, signature='sss') #triple s for 3x strings
 	def requestRecdBits(self, whoWantsIt, whoTheyWantItFrom, recdMd5sumOfIt ):
-		self._logger.debug('I am requesting a high-res version of someones media.')
+		record.log.debug('I am requesting a high-res version of someones media.')
 
 
 	def _reqRecdTubeCb(self, whoWantsIt, whoTheyWantItFrom, recdMd5sumOfIt, sender=None):
 		if sender == self.tube.get_unique_name():
-			self._logger.debug("_reqRecdTubeCb: sender is my bus name, so ignore my own signal")
+			record.log.debug("_reqRecdTubeCb: sender is my bus name, so ignore my own signal")
 			return
 		elif (whoWantsIt == self.myHashKey):
-			self._logger.debug('_reqRecdTubeCb: excuse me?  you are asking me to share a photo with myself?')
+			record.log.debug('_reqRecdTubeCb: excuse me?  you are asking me to share a photo with myself?')
 			return
 		elif (whoTheyWantItFrom != self.myHashKey):
-			self._logger.debug('_reqRecdTubeCb: ive overhead someone wants a photo, but not from me')
+			record.log.debug('_reqRecdTubeCb: ive overhead someone wants a photo, but not from me')
 			return
 
 		self.emit( "recd-request", str(whoWantsIt), str(recdMd5sumOfIt) )
@@ -81,46 +76,46 @@ class RecordTube(ExportedGObject):
 
 		for chunk in range(chunks):
 			bytes = f.read(chunk_size)
-			self._logger.debug("sending " + str(chunk+1) + " of " + str(chunks) + " to " + sendThisTo )
-			self.broadcastRecdBits(md5, chunk+1, chunks, bytes, sendThisTo, self.myHashKey)
+			Record.log.debug("sending " + str(chunk+1) + " of " + str(chunks) + " to " + sendThisTo )
+			self.broadcastRecdBits(md5, chunk+1, chunks, bytes, sendThisTo, Instance.keyHashPrintable)
 
 		f.close()
 		return True
 
 
-	@signal(dbus_interface=IFACE, signature='suuayss')
+	@signal(dbus_interface=Constants.IFACE, signature='suuayss')
 	def broadcastRecdBits(self, md5, part, numparts, bytes, sendTo, fromWho ):
 		pass
 
 
 	def _getRecdTubeCb(self, md5, part, numparts, bytes, sentTo, fromWho, sender=None):
 		if sender == self.tube.get_unique_name():
-			self._logger.debug("_reqRecdTubeCb: sender is my bus name, so ignore my own signal")
+			record.log.debug("_reqRecdTubeCb: sender is my bus name, so ignore my own signal")
 			return
 		if (fromWho == self.myHashKey):
-			self._logger.debug('_getRecdTubeCb: i dont want bits from meself, thx anyway.  schizophrenic?')
+			record.log.debug('_getRecdTubeCb: i dont want bits from meself, thx anyway.  schizophrenic?')
 			return
 		if (sentTo != self.myHashKey):
-			self._logger.debug('_getRecdTubeCb: ive overhead someone sending bits, but not to me!')
+			record.log.debug('_getRecdTubeCb: ive overhead someone sending bits, but not to me!')
 			return
 
 		self.emit( "recd-bits-arrived", md5, part, numparts, bytes, fromWho )
 
 
-	@signal(dbus_interface=IFACE, signature='sss') #triple s for 3x strings
+	@signal(dbus_interface=Constants.IFACE, signature='sss') #triple s for 3x strings
 	def unavailableRecd(self, md5sumOfIt, whoDoesntHaveIt, whoAskedForIt):
-		self._logger.debug('unavailableRecd: id love to share this photo, but i am without a copy meself chum')
+		record.log.debug('unavailableRecd: id love to share this photo, but i am without a copy meself chum')
 
 
 	def _unavailableRecdTubeCb( self, md5sumOfIt, whoDoesntHaveIt, whoAskedForIt, sender=None):
 		if sender == self.tube.get_unique_name():
-			self._logger.debug("_unavailableRecdTubeCb: sender is my bus name, so ignore my own signal")
+			record.log.debug("_unavailableRecdTubeCb: sender is my bus name, so ignore my own signal")
 			return
 		if (whoDoesntHaveIt == self.myHashKey):
-			self._logger.debug('_unavailableRecdTubeCb: yes, i know i dont have it, i just told you/me/us.')
+			record.log.debug('_unavailableRecdTubeCb: yes, i know i dont have it, i just told you/me/us.')
 			return
 		if (whoAskedForIt != self.myHashKey):
-			self._logger.debug('_unavailableRecdTubeCb: ive overheard someone doesnt have a photo, but i didnt ask for that one anyways')
+			record.log.debug('_unavailableRecdTubeCb: ive overheard someone doesnt have a photo, but i didnt ask for that one anyways')
 			return
 
 		self.emit("recd-unavailable", md5sumOfIt, whoDoesntHaveIt)
\ No newline at end of file