Index: scripts/.modules/script.module.xbmcaddon/lib/xbmcaddon.py
===================================================================
--- scripts/.modules/script.module.xbmcaddon/lib/xbmcaddon.py	(revision 30855)
+++ scripts/.modules/script.module.xbmcaddon/lib/xbmcaddon.py	(working copy)
@@ -26,19 +26,42 @@
     def __init__( self, id ):
         """
             Initializer for passing the addon's id and setting addon info.
-            Currently id is not used for xbmc4xbox.
         """
         # get root dir
-        cwd = self._get_root_dir()
-        # get settings and language methods
-        self._get_methods( cwd )
-        # TODO: do we want to use id for anything?
+        cwd = self._get_root_dir( sysargv[0] )
+        xbmc.log( "xbmcaddon: trying " + cwd, xbmc.LOGDEBUG )
         # parse addon.xml and set all addon info
         self._set_addon_info( xbmc.translatePath( cwd ), id )
 
-    def _get_root_dir( self ):
+        #check to make sure we are in the right plugin dir
+        if self._info.get( 'id', '' ) != id:
+            #try using id to find correct dir
+            parts = id.split( '.' )
+            cwd = "plugin://%s/%s" % ( parts[ 1 ], parts[ 2 ] )
+            xbmc.log( "xbmcaddon: trying " + cwd, xbmc.LOGDEBUG )
+            # parse addon.xml and reset all addon info
+            self._set_addon_info( xbmc.translatePath( cwd ), id )
+
+        #have we got the right dir now?
+        if self._info.get( 'id', '' ) != id:
+            #walk plugin directories to try to find correct one
+            base_path = os.path.dirname( xbmc.translatePath( cwd ) ) + os.sep
+            for directory in os.listdir(base_path):
+                cwd = "plugin://%s/%s" % ( parts[ 1 ], directory )
+                xbmc.log( "xbmcaddon: trying " + cwd, xbmc.LOGDEBUG )
+                # parse addon.xml and reset all addon info
+                self._set_addon_info( xbmc.translatePath( cwd ), id )
+                #surely we must have found it by now
+                if self._info.get( 'id', '' ) == id:
+                    break
+                    
+        # get settings and language methods
+        self._get_methods( cwd )
+        xbmc.log( "xbmcaddon: using " + cwd, xbmc.LOGDEBUG )
+
+    def _get_root_dir( self, path ):
         # get current working directory, we need to reset sys.argv[ 0 ] to a plugin for weather plugins as they aren't run as plugins, but they are categorized as plugins
-        cwd = os.path.dirname( xbmc.validatePath( sysargv[ 0 ].replace( "Q:\\plugins\\weather\\", "plugin://weather/" ) ) )
+        cwd = os.path.dirname( xbmc.validatePath( path.replace( "Q:\\plugins\\weather\\", "plugin://weather/" ) ) )
         # check if we're at root folder of addon
         if ( not os.path.isfile( os.path.join( xbmc.translatePath( cwd ), "addon.xml" ) ) ):
             # we're not at root, assume resources/lib/
@@ -57,48 +80,60 @@
 
     def _set_addon_info( self, cwd, id ):
         # get source
-        xml = open( os.path.join( cwd, "addon.xml" ), "r" ).read()
-        # parse source
-        dom = parseString( xml )
-        # get main element
-        item = dom.getElementsByTagName( "addon" )[ 0 ]
-        # set info
-        self._info[ "id" ] = item.getAttribute( "id" )
-        self._info[ "name" ] = item.getAttribute( "name" )
-        self._info[ "version" ] = item.getAttribute( "version" )
-        self._info[ "author" ] = item.getAttribute( "provider-name" )
-        for extension in dom.getElementsByTagName( "extension" ):
-            # get library and type
-            if ( extension.hasAttribute( "library" ) ):
-                self._info[ "library" ] = extension.getAttribute( "library" )
-                self._info[ "type" ] = extension.getAttribute( "point" )
-            # get any meta data
-            if ( extension.getAttribute( "point" ) == "xbmc.addon.metadata" ):
-                locale = xbmc.getRegion( "locale" )
-                for metatype in [ "disclaimer", "summary", "description" ]:
-                    metadict = { "en": "" }
-                    for metadata in extension.getElementsByTagName( metatype ):
-                        if ( metadata.getAttribute( "lang" ) != "" ):
-                            metadict[ metadata.getAttribute( "lang" ) ] = metadata.firstChild.data
+        try:
+            xml_file = os.path.join( cwd, "addon.xml" )
+            xml = open( xml_file, "r" ).read()
+            # parse source
+            dom = parseString( xml )
+            # get main element
+            item = dom.getElementsByTagName( "addon" )[ 0 ]
+            # clear out old info
+            self._info = {}
+            # set info
+            self._info[ "id" ] = item.getAttribute( "id" )
+            self._info[ "name" ] = item.getAttribute( "name" )
+            self._info[ "version" ] = item.getAttribute( "version" )
+            self._info[ "author" ] = item.getAttribute( "provider-name" )
+            for extension in dom.getElementsByTagName( "extension" ):
+                # get library and type
+                if ( extension.hasAttribute( "library" ) ):
+                    self._info[ "library" ] = extension.getAttribute( "library" )
+                    self._info[ "type" ] = extension.getAttribute( "point" )
+                # get any meta data
+                if ( extension.getAttribute( "point" ) == "xbmc.addon.metadata" ):
+                    locale = xbmc.getRegion( "locale" )
+                    for metatype in [ "disclaimer", "summary", "description" ]:
+                        metadict = { "en": "" }
+                        for metadata in extension.getElementsByTagName( metatype ):
+                            if ( metadata.getAttribute( "lang" ) != "" ):
+                                try:
+                                    metadict[ metadata.getAttribute( "lang" ) ] = metadata.firstChild.data
+                                except:
+                                    metadict[ metadata.getAttribute( "lang" ) ] = ""
+                            else:
+                                try:
+                                    metadict[ "en" ] = metadata.firstChild.data
+                                except:
+                                    metadict[ "en" ] = ""
+                        if ( metadict.has_key( locale ) ):
+                            self._info[ metatype ] = metadict[ locale ]
                         else:
-                            metadict[ "en" ] = metadata.firstChild.data
-                    if ( metadict.has_key( locale ) ):
-                        self._info[ metatype ] = metadict[ locale ]
-                    else:
-                        self._info[ metatype ] = metadict[ "en" ]
-        # reset this to default.py as that's what xbox uses
-        self._info[ "library" ] = "default.py"
-        self._info[ "path" ] = cwd
-        self._info[ "libpath" ] = os.path.join( cwd, self._info[ "library" ] )
-        self._info[ "icon" ] = os.path.join( cwd, "default.tbn" )
-        self._info[ "fanart" ] = os.path.join( cwd, "fanart.jpg" )
-        self._info[ "changelog" ] = os.path.join( cwd, "changelog.txt" )
-        if ( cwd.startswith( "Q:\\plugins" ) ):
-            self._info[ "profile" ] = "special://profile/plugin_data/%s/%s" % ( os.path.basename( os.path.dirname( cwd ) ), os.path.basename( cwd ), )
-        else:
-            self._info[ "profile" ] = "special://profile/script_data/%s" % ( os.path.basename( cwd ), )
-        # cleanup
-        dom.unlink()
+                            self._info[ metatype ] = metadict[ "en" ]
+            # reset this to default.py as that's what xbox uses
+            self._info[ "library" ] = "default.py"
+            self._info[ "path" ] = cwd
+            self._info[ "libpath" ] = os.path.join( cwd, self._info[ "library" ] )
+            self._info[ "icon" ] = os.path.join( cwd, "default.tbn" )
+            self._info[ "fanart" ] = os.path.join( cwd, "fanart.jpg" )
+            self._info[ "changelog" ] = os.path.join( cwd, "changelog.txt" )
+            if ( cwd.startswith( "Q:\\plugins" ) ):
+                self._info[ "profile" ] = "special://profile/plugin_data/%s/%s" % ( os.path.basename( os.path.dirname( cwd ) ), os.path.basename( cwd ), )
+            else:
+                self._info[ "profile" ] = "special://profile/script_data/%s" % ( os.path.basename( cwd ), )
+            # cleanup
+            dom.unlink()
+        except:
+            xbmc.log( "xbmcaddon: could not open " + xml_file, xbmc.LOGDEBUG )
 
     def getAddonInfo( self, id ):
         """