1 files changed, 4 insertions, 12 deletions
diff --git a/pbserver.py b/pbserver.py
index fb7fb65..a2fb1a7 100755
--- a/pbserver.py
+++ b/pbserver.py
@@ -6,16 +6,16 @@ from pb.imgrid import Imgrid
 from pb.breaker import Breaker
 from pb.pattern import Pattern
 
-from pb.config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME
+from pb.config import AWS_SECRET_ACCESS_KEY, AWS_ACCESS_KEY_ID, BUCKET_NAME, BIN_IDENTIFY
+import pb.lib.utils as utils
 
 import os
 import sys
 import pb.lib.db as db
-import mimetypes
+
 import sha
 from subprocess import call, Popen, PIPE
 import simplejson as json
-BIN_IDENTIFY = "/usr/bin/identify"
 
 from boto.s3.connection import S3Connection
 from boto.s3.key import Key
@@ -30,20 +30,12 @@ BASE_URL = "http://i.asdf.us"
 def hashdir(filename):
     return  sha.new(filename).hexdigest()[:2]
 
-def file_size (filepath):
-    try:
-        return os.stat(filepath)[6]
-    except Exception as e:
-        sys.stderr.write(str(e))
-        raise;
-
 def bin_identify (filepath):
   ident = Popen([BIN_IDENTIFY, filepath], stdout=PIPE).communicate()[0]
   partz = ident.split(" ")
   width,height = partz[2].split("x")
   return [ width, height ]
 
-
 def cleanup(filepath):
     try:
         call(['rm', filepath])
@@ -80,7 +72,7 @@ def insert_cmd (date, remote_addr, username, url, directory, oldfile, newfile, c
 def return_image(im, insert_url="NULL"):
     directory = hashdir(im.filename)
     dimensions = bin_identify(im.filepath)
-    size = file_size(im.filepath)
+    size = utils.file_size(im.filepath)
     objectname = "im/{}/{}".format(directory, im.filename)
     try:
         s3move(im.filepath, objectname)