fix problems with the space to tab conversion..

fix addFSPath...

[git-p4: depot-paths = "//depot/": change = 764]

ContentDirectory.py

@@ -51,11 +51,11 @@ class ContentDirectoryControl(UPnPPublisher, dict):
 		return i.id
 
 	def delItem(self, id):
-	if isinstance(self[id], Container):
-		for i in self.children[id]:
-			self.delItem(i)
-		assert len(self.children[id]) == 0
-		del self.children[id]
+		if isinstance(self[id], Container):
+			for i in self.children[id]:
+				self.delItem(i)
+			assert len(self.children[id]) == 0
+			del self.children[id]
 		del self[id]
 
 	def getchildren(self, item):
@@ -69,7 +69,7 @@ class ContentDirectoryControl(UPnPPublisher, dict):
 		self.children = { fakeparent: []}
 		self.needupdate = False
 		self.updateId = 0
-		self[fakeparent] = Container(None, '-1', 'fake')
+		self[fakeparent] = Container(None, None, '-1', 'fake')
 		root = self.addContainer(fakeparent, title)
 		assert root == '0'
 		del self[fakeparent]

DIDLLite.py

@@ -217,7 +217,7 @@ class Container(Object, list):
 
 	def __init__(self, cd, id, parentID, title, restricted = 0, creator = None):
 		Object.__init__(self, cd, id, parentID, title, restricted, creator)
-	list.__init__(self)
+		list.__init__(self)
 
 	def toElement(self):
 

SSDP.py

@@ -36,7 +36,7 @@ class SSDPServer(DatagramProtocol):
 	known = {}
 
 	def doStop(self):
-	'''Make sure we send out the byebye notifications.'''
+		'''Make sure we send out the byebye notifications.'''
 
 		self.transport.write('foobar', (SSDP_ADDR, SSDP_PORT))
 		for st in self.known:

pymediaserv

@@ -100,7 +100,7 @@ def addFSPath(cds, parent, dpath):
 			ext = ext.lower()
 			if os.path.isdir(fpath):
 				folder = cds.addContainer(parent, i, klass = StorageFolder)
-				addFSPath(folder, fpath)
+				addFSPath(cds, folder, fpath)
 			if not os.path.isfile(fpath):
 				continue
 			#if ext == '.ts':