← Back to branch summary

~dangarner/xibo/client-132

« back to all changes in this revision

Viewing changes to client/python/XiboClient.py

  • Committer: Dan Garner
  • Date: 2011-03-20 19:14:52 UTC
  • mfrom: (194.17.2 xibo-1.2)
  • Revision ID: dan@xibo.org.uk-20110320191452-tj01r79lxh8nx86d
Merged lp:~alexharrington/xibo/pyclient-122-fix

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/python/XiboClient.py
908
908
                            tmpSize = long(f.attributes['size'].value)
909
909
                            tmpHash = str(f.attributes['md5'].value)
910
910
                            tmpType = str(f.attributes['type'].value)
911
 
                            tmpId = int(f.attributes['id'].value)
 
911
                            try:
 
912
                                tmpId = int(f.attributes['id'].value)
 
913
                            except:
 
914
                                # Layout background images don't come down with IDs
 
915
                                # Blame Dan :D
 
916
                                tmpId = 0
912
917
 
913
918
                            if os.path.isfile(tmpPath) and os.path.getsize(tmpPath) == tmpSize:
914
919
                                # File exists and is the right size