WinGui:

[handbrake-jp/handbrake-jp-git.git] / gtk / src / create_resources.py

diff --git a/gtk/src/create_resources.py b/gtk/src/create_resources.py
index 1e346fb..5d21ba8 100644 (file)
--- a/gtk/src/create_resources.py
+++ b/gtk/src/create_resources.py
@@ -1,7 +1,6 @@
 #! /bin/python
 #
 
-import gtk
 import types
 import os
 import sys
@@ -10,7 +9,7 @@ import datetime
 import plistlib
 import getopt
 from xml.parsers import expat
-
+from gtk import gdk
 
 pl = dict()
 stack = list()
@@ -36,12 +35,12 @@ def start_element_handler(tag, attr):
                        val = dict()
                        stack.append(val)
        elif tag == "icon":
-               fname = attr["file"]
-               fname = find_file(fname)
+               fbase = attr["file"]
+               fname = find_file(fbase)
                key = attr["name"]
                if fname != None and key != None:
                        val = dict()
-                       pb = gtk.gdk.pixbuf_new_from_file(fname)
+                       pb = gdk.pixbuf_new_from_file(fname)
                        val["colorspace"] = pb.get_colorspace()
                        val["alpha"] = pb.get_has_alpha()
                        val["bps"] = pb.get_bits_per_sample()
@@ -49,15 +48,21 @@ def start_element_handler(tag, attr):
                        val["height"] = pb.get_height()
                        val["rowstride"] = pb.get_rowstride()
                        val["data"] = plistlib.Data(pb.get_pixels())
+               elif fname == None:
+                       print >> sys.stderr, ( "Error: No such icon file %s" % fbase )
+                       sys.exit(1)
        elif tag == "plist":
-               fname = attr["file"]
-               fname = find_file(fname)
+               fbase = attr["file"]
+               fname = find_file(fbase)
                key = attr["name"]
                if fname != None and key != None:
                        val = plistlib.readPlist(fname)
+               elif fname == None:
+                       print >> sys.stderr, ( "Error: No such plist file %s" % fbase )
+                       sys.exit(1)
        elif tag == "string":
-               fname = attr["file"]
-               fname = find_file(fname)
+               fbase = attr["file"]
+               fname = find_file(fbase)
                key = attr["name"]
                if fname != None and key != None:
                        try:
@@ -65,6 +70,10 @@ def start_element_handler(tag, attr):
                                val = ff.read()
                        except Exception, err:
                                print >> sys.stderr, ( "Error: %s"  % str(err) )
+                               sys.exit(1)
+               elif fname == None:
+                       print >> sys.stderr, ( "Error: No such string file %s" % fbase )
+                       sys.exit(1)
                
        if val != None:
                if type(current) == types.DictType:
@@ -101,7 +110,7 @@ def find_file(name):
        global inc_list
 
        for inc_dir in inc_list:
-               inc = "%s/%s" % inc_dir, name
+               inc = "%s/%s" % (inc_dir, name)
                if os.path.isfile(inc):
                        return inc
 
@@ -138,12 +147,6 @@ def main():
                print >> sys.stderr, ( "Error: %s"  % str(err) )
                sys.exit(1)
 
-       try:
-               infile = open(args[0])
-       except Exception, err:
-               print >> sys.stderr, ( "Error: %s"  % str(err) )
-               sys.exit(1)
-
        if len(args) > 1:
                try:
                        outfile = open(args[1], "w")