Added support for multiple image sizes. Changed imgfetch to fetchimg.

diff --git a/fetchimg.py b/fetchimg.py
new file mode 100644 (file)
index 0000000..1c5d730
--- /dev/null
+++ b/fetchimg.py
@@ -0,0 +1,33 @@
+import urllib
+import os.path
+
+def portrait_filename( char_id, img_size ):
+
+    err_img = 'imgs/error.jpg'
+
+    # we can only accept 64 or 256... I know an exclamation point is not an error message, but I'll come back to this. FIXME --danny
+    if not ( img_size == 64 or img_size == 256 ):
+        return err_img
+
+    # if asked for the large version, save it under a diff name --danny
+    if img_size == 64:
+        filename = "imgs/%s.jpg" % char_id
+    elif img_size == 256:
+        filename = "imgs/%s_lg.jpg" % char_id
+
+    if os.path.isfile( filename ):
+        return filename
+
+    # specify size and cid --danny
+    try:
+        img_url = "http://img.eve.is/serv.asp?s=%s&c=%s" % ( str( img_size ), char_id )
+        img = urllib.urlopen( img_url ).read()
+    except IOError:
+        return err_img
+
+    # write it, and hit the road. --danny
+
+    fp = open( filename, 'w' )
+    fp.write( img )
+    fp.close()
+    return filename

diff --git a/imgfetch.py b/imgfetch.py
deleted file mode 100644 (file)
index e8ea274..0000000
--- a/imgfetch.py
+++ /dev/null
@@ -1,19 +0,0 @@
-import urllib
-import os.path
-
-def portrait_filename( char_id ):
-
-    filename = "imgs/%s.jpg" % char_id
-
-    if os.path.isfile( filename ):
-        return filename
-
-    try:
-        img = urllib.urlopen( "http://img.eve.is/serv.asp?s=64&c=%s" % char_id ).read()
-    except IOError:
-        return 'imgs/error.jpg'
-
-    fp = open( filename, 'w' )
-    fp.write( img )
-    fp.close()
-    return filename

diff --git a/mevemon.py b/mevemon.py
index 6a0fbf9..a84715d 100644 (file)
--- a/mevemon.py
+++ b/mevemon.py
@@ -1,7 +1,7 @@
 import hildon
 import gtk
 from eveapi import eveapi
-import imgfetch
+import fetchimg
 
 # we will store our preferences in gconf
 import gnome.gconf
@@ -60,7 +60,7 @@ class mEveMon():
                 return placeholder_chars
             # append each char we get to the list we'll return to the UI --danny
             for character in api_char_list.characters:
-                ui_char_list.append( ( character.name, imgfetch.portrait_filename( character.characterID ) ) )
+                ui_char_list.append( ( character.name, fetchimg.portrait_filename( character.characterID, 64 ) ) )
             return ui_char_list
         # if not entered into gconf, error message --danny
         else: