Changeset 1165 for trunk/fl5/src/com/longtailvideo/jwplayer/view/skins/ZIPSkin.as

Timestamp:

07/21/10 11:32:50 (3 years ago)

Author:

pablo

Message:

Searches into Zip files if skin XML manifest is incorrectly named (972)

File:

• trunk/fl5/src/com/longtailvideo/jwplayer/view/skins/ZIPSkin.as (modified) (2 diffs)

trunk/fl5/src/com/longtailvideo/jwplayer/view/skins/ZIPSkin.as

@@ -41 +41 @@
                         _zipFile = new ZipFile(data);
                         try {
-                                var zipEntry:ZipEntry = _zipFile.getEntry(_urlPrefix + '.xml');
+                                var zipEntry:ZipEntry = getXMLEntry(_zipFile, _urlPrefix);
                                 if (!zipEntry) {
-                                        zipEntry =  _zipFile.getEntry(_urlPrefix+'/'+_urlPrefix + '.xml');
-                                } else {
-                                        _urlPrefix = null;
+                                        sendError("No XML file found in skin ZIP");
+                                        return;
                                 }
+                                _urlPrefix = zipEntry.name.substring(0, zipEntry.name.lastIndexOf('/')); 
                                 _skinXML = XML(String(_zipFile.getInput(zipEntry)));
                                 parseSkin();
@@ -52 +52 @@
                                 sendError(e.message);
                         }
+                }
+                
+                protected function getXMLEntry(file:ZipFile, prefix:String=""):ZipEntry {
+                        var entry:ZipEntry = file.getEntry(prefix + '.xml');
+                        if (entry) { return entry; }
+                        
+                        entry = file.getEntry(prefix + '/' + prefix + '.xml');
+                        if (entry) { return entry; }
+                        
+                        for each (entry in file.entries) {
+                                if (Strings.extension(entry.name) == "xml") {
+                                        if (XML(String(file.getInput(entry))).localName() == "skin") {
+                                                return entry;
+                                        }
+                                }
+                        }
+                        
+                        return null;
                 }