diff options
Diffstat (limited to 'apps/photos')
| -rw-r--r-- | apps/photos/__init__.py | 0 | ||||
| -rw-r--r-- | apps/photos/admin.py | 67 | ||||
| -rw-r--r-- | apps/photos/detail_urls.py | 10 | ||||
| -rw-r--r-- | apps/photos/models.py | 201 | ||||
| -rw-r--r-- | apps/photos/retriever.py | 512 | ||||
| -rw-r--r-- | apps/photos/urls.py | 13 | ||||
| -rw-r--r-- | apps/photos/views.py | 50 |
7 files changed, 0 insertions, 853 deletions
diff --git a/apps/photos/__init__.py b/apps/photos/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/apps/photos/__init__.py +++ /dev/null diff --git a/apps/photos/admin.py b/apps/photos/admin.py deleted file mode 100644 index 29f5dbf..0000000 --- a/apps/photos/admin.py +++ /dev/null @@ -1,67 +0,0 @@ -from django.contrib import admin -from django.contrib.gis.admin import OSMGeoAdmin -from django.contrib.gis.maps.google import GoogleMap -from django.conf import settings - -from photos.models import Photo,PhotoGallery - -GMAP = GoogleMap(key=settings.GOOGLE_MAPS_API_KEY) - -class PhotoAdmin(OSMGeoAdmin): - list_display = ('title','admin_thumbnail', 'flickr_id', 'pub_date',) - list_filter = ('pub_date',) - search_fields = ['title', 'description'] - fieldsets = ( - (None, {'fields': (('title', 'description'),'pub_date', 'tags',('lat','lon'))}), - ('Exif Data', {'fields': ('exif_aperture','exif_exposure','exif_iso','exif_focal_length','exif_lens','exif_date','exif_make','exif_model'), 'classes': ('collapse')}), - ('Flickr Data', {'fields': ('flickr_id','flickr_owner','flickr_farm','flickr_server','flickr_secret','flickr_originalsecret'), 'classes': ('collapse')}), - ) - extra_js = [GMAP.api_url + GMAP.key] - map_template = 'gis/admin/google.html' - # Default GeoDjango OpenLayers map options - # Uncomment and modify as desired - # To learn more about this jargon visit: - # www.openlayers.org - - #default_lon = 0 - #default_lat = 0 - #default_zoom = 4 - #display_wkt = False - #display_srid = False - #extra_js = [] - #num_zoom = 18 - #max_zoom = False - #min_zoom = False - #units = False - #max_resolution = False - #max_extent = False - #modifiable = True - #mouse_position = True - #scale_text = True - #layerswitcher = True - scrollable = False - #admin_media_prefix = settings.ADMIN_MEDIA_PREFIX - map_width = 700 - map_height = 325 - #map_srid = 4326 - #map_template = 'gis/admin/openlayers.html' - #openlayers_url = 'http://openlayers.org/api/2.6/OpenLayers.js' - #wms_url = 'http://labs.metacarta.com/wms/vmap0' - #wms_layer = 'basic' - #wms_name = 'OpenLayers WMS' - #debug = False - #widget = OpenLayersWidget - -admin.site.register(Photo, PhotoAdmin) - - -class PhotoGalleryAdmin(OSMGeoAdmin): - list_display = ('set_title','region','location','pub_date') - list_filter = ('region','location') - fieldsets = ( - (None, {'fields': (('set_id','set_title', 'set_desc'),'set_slug','primary','location','region','photos','pub_date')}), - ) - - - -admin.site.register(PhotoGallery, PhotoGalleryAdmin)
\ No newline at end of file diff --git a/apps/photos/detail_urls.py b/apps/photos/detail_urls.py deleted file mode 100644 index 9ff9b84..0000000 --- a/apps/photos/detail_urls.py +++ /dev/null @@ -1,10 +0,0 @@ -from django.conf.urls.defaults import * -from photos.models import Photo - -detail_dict = { - 'queryset': Photo.objects.all(), -} - -urlpatterns = patterns('django.views.generic.list_detail', - (r'^(?P<object_id>\d+)/$', 'object_detail', dict(detail_dict, template_name='details/photo.html')), -) diff --git a/apps/photos/models.py b/apps/photos/models.py deleted file mode 100644 index d5f4d51..0000000 --- a/apps/photos/models.py +++ /dev/null @@ -1,201 +0,0 @@ -import datetime -import Image -from django.contrib.gis.db import models -from django.contrib.syndication.feeds import Feed -from django.contrib.sitemaps import Sitemap -from django.utils.encoding import force_unicode -from django.conf import settings - - -from taggit.managers import TaggableManager - -from locations.models import Location,Region - -class Photo(models.Model): - description = models.TextField(blank=True, null=True) - title = models.CharField(blank=True, max_length=300) - pub_date = models.DateTimeField() - tags = TaggableManager(blank=True) - exif_aperture = models.CharField(max_length=50, blank=True, null=True) - exif_make = models.CharField(max_length=50, blank=True, null=True) - exif_model = models.CharField(max_length=50, blank=True, null=True) - exif_exposure = models.CharField(max_length=50, blank=True, null=True) - exif_iso = models.CharField(max_length=50, blank=True, null=True) - exif_focal_length = models.CharField(max_length=50, blank=True, null=True) - exif_lens = models.CharField(max_length=50, blank=True, null=True) - exif_date = models.DateTimeField() - """Flickr Specific Stuff""" - flickr_id = models.CharField(max_length=300) #varchar since Flickr ids are larger than than integerfield can handle and BigIntegerField gets weird in Postgres. - flickr_owner = models.CharField(max_length=20) - flickr_server = models.IntegerField() - flickr_farm = models.IntegerField() - flickr_secret = models.CharField(max_length=50) - flickr_originalsecret = models.CharField(max_length=50) - lon = models.FloatField('Longitude',help_text="Longitude of centerpoint",null=True) - lat = models.FloatField('Latitude',help_text="Latitude of centerpoint",null=True) - location = models.ForeignKey(Location, null=True) - region = models.ForeignKey(Region, null=True) - slideshowimage_width = models.CharField(max_length=4, blank=True, null=True) - slideshowimage_height = models.CharField(max_length=4, blank=True, null=True) - slideshowimage_margintop = models.CharField(max_length=4, blank=True, null=True) - slideshowimage_marginleft = models.CharField(max_length=4, blank=True, null=True) - - - - class Meta: - ordering = ('-pub_date',) - - - def admin_thumbnail(self): - return force_unicode('<a href="%s"><img src="%s"></a>' % \ - (self.get_absolute_url(), self.get_small_square_url())) - admin_thumbnail.allow_tags = True - admin_thumbnail.short_description = 'Thumbnail' - - def get_local_medium_url(self): - return '%sflickr/med/%s/%s.jpg' %(settings.IMAGES_URL,self.pub_date.strftime("%Y"),self.flickr_id) - - def get_local_orig_url(self): - return '%sflickr/full/%s/%s.jpg' %(settings.IMAGES_URL,self.pub_date.strftime("%Y"),self.flickr_id) - - def get_local_slideshow_url(self): - return '%sslideshow/%s/%s.jpg' %(settings.IMAGES_URL,self.pub_date.strftime("%Y"),self.flickr_id) - def __unicode__(self): - return self.title - - def get_absolute_url(self): - return "/photo/%s/" % (self.id) - - def get_model_name(self): - return 'photo' - - def get_small_square_url(self): - return self.get_pic_url(size="small_square") - - def get_large_url(self): - return self.get_pic_url(size="large") - - def get_small_url(self): - return self.get_pic_url(size="small") - - def get_medium_url(self): - return self.get_pic_url(size="medium") - - def get_original_url(self): - #return self.get_pic_url(size="original") - return "http://farm%s.static.flickr.com/%s/%s_%s_o.jpg" % (self.flickr_farm, self.flickr_server, self.flickr_id, self.flickr_originalsecret) - - @property - def get_height(self): - im = Image.open('%sslideshow/%s/%s.jpg' %(settings.IMAGES_ROOT,self.pub_date.strftime("%Y"),self.flickr_id)) - xsize, ysize = im.size - return ysize - @property - def get_width(self): - im = Image.open('%sslideshow/%s/%s.jpg' %(settings.IMAGES_ROOT,self.pub_date.strftime("%Y"),self.flickr_id)) - xsize, ysize = im.size - cal = xsize-120 - return xsize - @property - def get_margin_top(self): - im = Image.open('%sslideshow/%s/%s.jpg' %(settings.IMAGES_ROOT,self.pub_date.strftime("%Y"),self.flickr_id)) - xsize, ysize = im.size - mtop = 340-(ysize/2) - return mtop - - @property - def get_margin_left(self): - im = Image.open('%sslideshow/%s/%s.jpg' %(settings.IMAGES_ROOT,self.pub_date.strftime("%Y"),self.flickr_id)) - xsize, ysize = im.size - mtop = 500-(xsize/2) - return mtop - - @property - def flickr_link(self): - return '%s%s/' %('http://www.flickr.com/photos/luxagraf/', self.flickr_id) - - @property - def is_portait(self): - if int(self.slideshowimage_height) > int(self.slideshowimage_width): - return True - else: - return False - def get_pic_url(self, size='small'): - # small_square=75x75 - # thumb=100 on longest side - # small=240 on longest side - # medium=500 on longest side - # large=1024 on longest side - # original=duh - - base_url = "http://static.flickr.com" - size_char='s' # default to small_square - - if size == 'small_square': - size_char='_s' - elif size == 'thumb': - size_char='_t' - elif size == 'small': - size_char='_m' - elif size == 'medium': - size_char='' - elif size == 'large': - size_char='_b' - elif size == 'original': - size_char='_o' - - return "http://farm%s.static.flickr.com/%s/%s_%s%s.jpg" % (self.flickr_farm, self.flickr_server, self.flickr_id, self.flickr_secret, size_char) - - def get_tumble_image(self): - return "%s/crops/%s/%s.jpg" %(settings.IMAGES_URL, self.pub_date.strftime("%Y/%b").lower(), self.id) - - - def get_previous_published(self): - return self.get_previous_by_pub_date() - - def get_next_published(self): - return self.get_next_by_pub_date() - - def comment_period_open(self): - return self.enable_comments and datetime.datetime.today() - datetime.timedelta(30) <= self.pub_date - - def save(self, *args, **kwargs): - super(Photo, self).save() - -class PhotoGallery(models.Model): - set_id = models.CharField(blank=True, max_length=300) - set_title = models.CharField(blank=True, max_length=300) - set_desc = models.TextField(blank=True, null=True) - set_slug = models.CharField(blank=True, max_length=300) - primary = models.CharField(blank=True, max_length=300) - photos = models.ManyToManyField(Photo) - location = models.ForeignKey(Location, null=True) - region = models.ForeignKey(Region, null=True) - pub_date = models.DateTimeField(null=True) - - class Meta: - ordering = ('-pub_date','id') - verbose_name_plural = 'Photo Galleries' - get_latest_by = 'pub_date' - - - def __unicode__(self): - return self.set_title - - def get_main_image(self): - return "%sgallery_thumbs/%s.jpg" % (settings.IMAGES_URL, self.id) - - def get_absolute_url(self): - return "/photos/galleries/%s/" % (self.set_slug) - - -class PhotoGallerySitemap(Sitemap): - changefreq = "never" - priority = 0.7 - - def items(self): - return PhotoGallery.objects.all() - - def lastmod(self, obj): - return obj.pub_date - diff --git a/apps/photos/retriever.py b/apps/photos/retriever.py deleted file mode 100644 index 2a98d09..0000000 --- a/apps/photos/retriever.py +++ /dev/null @@ -1,512 +0,0 @@ -from __future__ import division -import datetime -import os -import cStringIO # *much* faster than StringIO -import urllib - - -from django.contrib.contenttypes.models import ContentType -from django.template.defaultfilters import slugify -from django.core.exceptions import ObjectDoesNotExist -from django.utils.encoding import force_unicode,smart_unicode -from django.conf import settings - -# Required PIL classes may or may not be available from the root namespace -# depending on the installation -try: - import Image - import ImageFile - import ImageFilter - import ImageEnhance -except ImportError: - try: - from PIL import Image - from PIL import ImageFile - from PIL import ImageFilter - from PIL import ImageEnhance - except ImportError: - raise ImportError("Could not import the Python Imaging Library.") - - -from utils.strutils import safestr -from photos.models import Photo,PhotoGallery - - -# Flickr Sync stuffs -API_KEY = settings.FLICKR_API_KEY -from utils.APIClients import FlickrClient - -EXIF_PARAMS = {"Aperture":'f/2.8',"Make":'Apple',"Model":'iPhone',"Exposure":'',"ISO Speed":'',"Focal Length":'',"Shutter Speed":'',"Lens":'','Date and Time (Original)':'2008:07:03 22:44:25'} - -def sync_flickr_photos(*args, **kwargs): - cur_page = 1 # Start on the first page of the stream - paginate_by = 100 # Get 100 photos at a time - dupe = False # Set our dupe flag for the following loop - BASE_PATH = 'http://flickr.com/services/rest/' - client = FlickrClient(BASE_PATH, API_KEY) - data = client.flickr_people_getPublicPhotos(user_id=settings.FLICKR_USER_ID, page=cur_page, per_page=paginate_by,extras="date_upload,date_taken,geo") - #photos.photos.photo.reverse() - for post in data.findall('photos/photo'): - info = dict((k, smart_unicode(post.get(k))) for k in post.keys()) - try: - row = Photo.objects.get(flickr_id=info['id'], flickr_secret=info['secret']) - # If the row exists already, set the dupe flag - dupe = True - print 'already have '+info['id']+' moving on' - except ObjectDoesNotExist: - #for debugging: - print info['title'] - taglist = [] - location, region = get_geo(float(info['latitude']),float(info['longitude'])) - details = client.flickr_photos_getInfo(user_id=settings.FLICKR_USER_ID, photo_id=force_unicode(info['id'])) - for t in details.findall('photo/tags/tag'): - tag = dict((k, smart_unicode(t.get(k))) for k in t.keys()) - taglist.append(tag['raw']) - exif = exif_handler(client.flickr_photos_getExif(user_id=API_KEY, photo_id=safestr(info['id']))) - - photo, created = Photo.objects.get_or_create( - title = info['title'], - flickr_id = info['id'], - flickr_owner = info['owner'], - flickr_server = info['server'], - flickr_secret = info['secret'], - flickr_originalsecret = force_unicode(details[0].attrib['originalsecret']), - flickr_farm = info['farm'], - pub_date = flickr_datetime_to_datetime(info['datetaken']), - description = force_unicode(details[0].findtext('description')), - exif_aperture = exif['Aperture'], - exif_make = exif['Make'], - exif_model = exif['Model'], - exif_exposure = exif['Exposure'], - exif_iso = exif['ISO Speed'], - exif_lens = exif['Lens'], - exif_focal_length = exif['Focal Length'], - exif_date = flickr_datetime_to_datetime(exif["Date and Time (Original)"].replace(':', '-', 2)), - lat = float(info['latitude']), - lon = float(info['longitude']), - region = region, - location = location, - ) - if created: - for t in taglist: - photo.tags.add(t) - #print info['title'], region, location - photo.save() - make_local_copies(photo) - slideshow_image(photo) - - -def exif_handler(data): - converted = {} - try: - for t in data.findall('photo/exif'): - e = dict((k, smart_unicode(t.get(k))) for k in t.keys()) - if safestr(e['label']) == "Aperture": - if not converted.has_key("Aperture"): - converted["Aperture"] = safestr(t.findtext('clean')) - else: - if safestr(e['tag']) != 'Exposure': - if safestr(e['tag']) == 'ExposureTime': - converted[safestr(e['label'])] = safestr(t.findtext('clean')) - else: - converted[safestr(e['label'])] = safestr(t.findtext('raw')) - except: - pass - for k,v in EXIF_PARAMS.items(): - if not converted.has_key(k): - converted[k] = v - return converted - - -def flickr_datetime_to_datetime(fdt): - from datetime import datetime - from time import strptime - date_parts = strptime(fdt, '%Y-%m-%d %H:%M:%S') - return datetime(*date_parts[0:6]) - -def get_geo(lat,lon): - from locations.models import Location, Region - from django.contrib.gis.geos import Point - pnt_wkt = Point(lon, lat) - try: - location = Location.objects.get(geometry__contains=pnt_wkt) - except Location.DoesNotExist: - location = None - try: - region = Region.objects.get(geometry__contains=pnt_wkt) - except Region.DoesNotExist: - region = None - return location, region - - -ImageFile.MAXBLOCK = 1000000 - -def slideshow_image(photo): - slide_dir = settings.IMAGES_ROOT + '/slideshow/'+ photo.pub_date.strftime("%Y") - if not os.path.isdir(slide_dir): - os.makedirs(slide_dir) - med = photo.get_original_url() - fname = urllib.urlopen(med) - im = cStringIO.StringIO(fname.read()) # constructs a StringIO holding the image - img = Image.open(im) - cur_width, cur_height = img.size - #if image landscape - if cur_width > cur_height: - new_width = 1000 - #check to make sure we aren't upsizing - if cur_width > new_width: - ratio = float(new_width)/cur_width - x = (cur_width * ratio) - y = (cur_height * ratio) - resized = img.resize((int(x), int(y)), Image.ANTIALIAS) - resized_filename = '%s/%s.jpg' %(slide_dir, photo.flickr_id) - resized.save(resized_filename, 'JPEG', quality=95, optimize=True) - else: - filename = '%s/%s.jpg' %(slide_dir, photo.flickr_id) - img.save(filename) - else: - #image portrait - new_height = 800 - #check to make sure we aren't upsizing - if cur_height > new_height: - ratio = float(new_height)/cur_height - x = (cur_width * ratio) - y = (cur_height * ratio) - resized = img.resize((int(x), int(y)), Image.ANTIALIAS) - resized_filename = '%s/%s.jpg' %(slide_dir, photo.flickr_id) - resized.save(resized_filename, 'JPEG', quality=95, optimize=True) - else: - filename = '%s/%s.jpg' %(slide_dir, photo.flickr_id) - img.save(filename) - photo.slideshowimage_width = photo.get_width - photo.slideshowimage_height = photo.get_height - photo.slideshowimage_margintop = photo.get_margin_top - photo.slideshowimage_marginleft = photo.get_margin_left - photo.save() - -def make_local_copies(photo): - orig_dir = settings.IMAGES_ROOT + '/flickr/full/'+ photo.pub_date.strftime("%Y") - if not os.path.isdir(orig_dir): - os.makedirs(orig_dir) - full = photo.get_original_url() - fname = urllib.urlopen(full) - im = cStringIO.StringIO(fname.read()) # constructs a StringIO holding the image - img = Image.open(im) - local_full = '%s/%s.jpg' %(orig_dir, photo.flickr_id) - img.save(local_full) - #save large size - large_dir = settings.IMAGES_ROOT + '/flickr/large/'+ photo.pub_date.strftime("%Y") - if not os.path.isdir(large_dir): - os.makedirs(large_dir) - large = photo.get_large_url() - fname = urllib.urlopen(large) - im = cStringIO.StringIO(fname.read()) # constructs a StringIO holding the image - img = Image.open(im) - local_large = '%s/%s.jpg' %(large_dir, photo.flickr_id) - if img.format == 'JPEG': - img.save(local_large) - #save medium size - med_dir = settings.IMAGES_ROOT + '/flickr/med/'+ photo.pub_date.strftime("%Y") - if not os.path.isdir(med_dir): - os.makedirs(med_dir) - med = photo.get_medium_url() - fname = urllib.urlopen(med) - im = cStringIO.StringIO(fname.read()) # constructs a StringIO holding the image - img = Image.open(im) - local_med = '%s/%s.jpg' %(med_dir, photo.flickr_id) - img.save(local_med) - - - -def make_gallery_thumb(photo,set): - crop_dir = settings.IMAGES_ROOT + '/gallery_thumbs/' - if not os.path.isdir(crop_dir): - os.makedirs(crop_dir) - remote = photo.get_original_url() - print remote - fname = urllib.urlopen(remote) - im = cStringIO.StringIO(fname.read()) # constructs a StringIO holding the image - img = Image.open(im) - - #calculate crop: - cur_width, cur_height = img.size - new_width, new_height = 291, 350 - ratio = max(float(new_width)/cur_width,float(new_height)/cur_height) - x = (cur_width * ratio) - y = (cur_height * ratio) - xd = abs(new_width - x) - yd = abs(new_height - y) - x_diff = int(xd / 2) - y_diff = int(yd / 2) - box = (int(x_diff), int(y_diff), int(x_diff+new_width), int(y_diff+new_height)) - - #create resized file - resized = img.resize((int(x), int(y)), Image.ANTIALIAS).crop(box) - # save resized file - resized_filename = '%s/%s.jpg' %(crop_dir, set.id) - try: - if img.format == 'JPEG': - resized.save(resized_filename, 'JPEG', quality=95, optimize=True) - else: - resized.save(resized_filename) - except IOError, e: - if os.path.isfile(resized_filename): - os.unlink(resized_filename) - raise e - #os.unlink(img) - - - -def sync_sets(*args, **kwargs): - dupe = False # Set our dupe flag for the following loop - BASE_PATH = 'http://flickr.com/services/rest/' - client = FlickrClient(BASE_PATH, API_KEY) - data = client.flickr_photosets_getList(user_id=settings.FLICKR_USER_ID) - nodes = data.findall('photosets/photoset') - for post in nodes: - info = dict((k, smart_unicode(post.get(k))) for k in post.keys()) - try: - row = PhotoGallery.objects.get(set_id__exact=info['id']) - # okay it already exists, but is it up-to-date? - #get_photos_in_set(row,set.id) - - except ObjectDoesNotExist: - disregard = ['POTD 2008','Snow Day','Wedding','Some random stuff'] - if force_unicode(post.findtext('title')) in disregard: - pass - else: - s = PhotoGallery.objects.create ( - set_id = force_unicode(info['id']), - set_title = force_unicode(post.findtext('title')), - set_desc = force_unicode(post.findtext('description')), - set_slug = slugify(force_unicode(post.findtext('title'))), - primary = force_unicode(info['primary']), - ) - get_photos_in_set(s) - #create the gallery thumbnail image: - photo = Photo.objects.get(flickr_id__exact=str(info['primary'])) - make_gallery_thumb(photo,s) - -def get_photos_in_set(set): - BASE_PATH = 'http://flickr.com/services/rest/' - client = FlickrClient(BASE_PATH, API_KEY) - data = client.flickr_photosets_getPhotos(user_id=settings.FLICKR_USER_ID, photoset_id=str(set.set_id)) - for post in data.findall('photoset/photo'): - info = dict((k, smart_unicode(post.get(k))) for k in post.keys()) - photo = Photo.objects.get(flickr_id__exact=str(info['id'])) - set.photos.add(photo) - - -""" -def sync_flickr_comments(*args, **kwargs): - cur_page = 1 # Start on the first page of the stream - paginate_by = 100 # Get 100 photos at a time - inc = 1 # Set our dupe flag for the following loop - # Get our flickr client running - client = FlickrClient(settings.FLICKR_API_KEY) - # get total number of photos in stream - total = client.flickr_people_getInfo(user_id=settings.FLICKR_USER_ID) - total_num = safestr(total.person.photos.count) - while (inc < int(total_num)): - photos = client.flickr_people_getPublicPhotos(user_id=settings.FLICKR_USER_ID, page=cur_page, per_page=paginate_by,extras="date_upload,date_taken,geo") - incr = 1 - for photo in photos.photos: - do_photo_comments(photo("id"),photo("secret")) - inc = inc+1 - incr = incr+1 - print cur_page - if incr == 100: - cur_page = cur_page+1 - - - -def do_photo_comments(id, secret): - # Get our flickr client running - client = FlickrClient(settings.FLICKR_API_KEY) - photo = Photo.objects.get(flickr_id=id, flickr_secret=secret) - comments = client.flickr_photos_comments_getList(user_id=settings.FLICKR_USER_ID, photo_id=id) - for item in comments.comments: - try: - item - print item('authorname') - dt = datetime.datetime.fromtimestamp(float(item('datecreate'))) - ctype = ContentType.objects.get_for_model(Photo) - try: - f = FreeComment.objects.get(content_type=ctype, object_id=photo.id, submit_date=dt) - #print f.id - except ObjectDoesNotExist: - if safestr(item('authorname')) == 'luxagraf': - mail = 'hyper@luxagraf.net' - else: - mail = slugify(item('authorname'))+'@flickr.com' - c = FreeComment.objects.create ( - content_type = ctype, - object_id = photo.id, - comment = safestr(item), - person_name = safestr(item('authorname')), - person_email = mail, - person_url = item('permalink'), - is_public = True, - site_id = 1, - approved = 0, - submit_date = dt - ) - - except AttributeError: - pass - - def get_country_name(lat,long): - name = GeoClient.findCountrySubdivision(lat,long, http_proxy=None) - if name.countrySubdivision.countryCode.PCDATA == "US": - r_name = "US-%s" %(force_unicode(STATE_LIST[name.countrySubdivision.adminCode1.PCDATA])) - else: - r_name = force_unicode(name.countrySubdivision.countryName.PCDATA) - return r_name - - -def create_size(self, photosize): - if self.size_exists(photosize): - return - if not os.path.isdir(self.cache_path()): - os.makedirs(self.cache_path()) - try: - im = Image.open(self.get_image_filename()) - except IOError: - return - if im.size == photosize.size(): - shutil.copy(self.get_image_filename(), - self._get_SIZE_path(photosize)) - return - cur_width, cur_height = im.size - new_width, new_height = photosize.size() - if photosize.crop: - ratio = max(float(new_width)/cur_width,float(new_height)/cur_height) - x = (cur_width * ratio) - y = (cur_height * ratio) - xd = abs(new_width - x) - yd = abs(new_height - y) - x_diff = int(xd / 2) - y_diff = int(yd / 2) - if self.crop_from == 'top': - box = (int(x_diff), 0, int(x_diff+new_width), new_height) - elif self.crop_from == 'left': - box = (0, int(y_diff), new_width, int(y_diff+new_height)) - elif self.crop_from == 'bottom': - box = (int(x_diff), int(yd), int(x_diff+new_width), int(y)) # y - yd = new_height - elif self.crop_from == 'right': - box = (int(xd), int(y_diff), int(x), int(y_diff+new_height)) # x - xd = new_width - else: - box = (int(x_diff), int(y_diff), int(x_diff+new_width), int(y_diff+new_height)) - resized = im.resize((int(x), int(y)), Image.ANTIALIAS).crop(box) - else: - if not new_width == 0 and not new_height == 0: - if cur_width > cur_height: - ratio = float(new_width)/cur_width - else: - ratio = float(new_height)/cur_height - else: - if new_width == 0: - ratio = float(new_height)/cur_height - else: - ratio = float(new_width)/cur_width - resized = im.resize((int(cur_width*ratio), int(cur_height*ratio)), Image.ANTIALIAS) - - # Apply effect if found - if self.effect is not None: - resized = self.effect.process(resized) - elif photosize.effect is not None: - resized = photosize.effect.process(resized) - - # save resized file - resized_filename = getattr(self, "get_%s_path" % photosize.name)() - try: - if im.format == 'JPEG': - resized.save(resized_filename, 'JPEG', quality=int(photosize.quality), - optimize=True) - else: - resized.save(resized_filename) - except IOError, e: - if os.path.isfile(resized_filename): - os.unlink(resized_filename) - raise e - -""" - - - -""" -for p in photos.photos.photo: - try: - row = Photo.objects.get(flickr_id=p.id, flickr_secret=p.secret) - # If the row exists already, set the dupe flag - dupe = True - #print 'already have '+p.id+' moving on' - except ObjectDoesNotExist: - #assign the photo to a place, uses "default" if the photo isn't near anything - place = place_handler(force_unicode(p.latitude)+","+force_unicode(p.longitude)) - #Grab tags - tags = client.flickr_photos_getInfo(user_id=settings.FLICKR_USER_ID, photo_id=force_unicode(p.id)) - # grab exif data - exif = exif_handler(client.flickr_photos_getExif(user_id=API_KEY, photo_id=safestr(p.id))) - # sort the exif data if it's available - if exif.has_key("Aperture"): - aperture = exif["Aperture"] - else: aperture = '' - if exif.has_key("Make"): - make = exif["Make"] - else: make = '' - if exif.has_key("Model"): - model = exif["Model"] - else: model = '' - if exif.has_key("Exposure"): - exposure = exif["Exposure"] - else: exposure = '' - if exif.has_key("ISO Speed"): - iso = exif["ISO Speed"] - else: iso = '' - if exif.has_key("Focal Length"): - length = exif["Focal Length"] - else: length = '' - if exif.has_key("Date and Time (Original)"): - dto = flickr_datetime_to_datetime(exif["Date and Time (Original)"].replace(':', '-', 2)) - else: dto = flickr_datetime_to_datetime(p.datetaken) - photo = Photo.objects.create( - title = p.title, - flickr_id = p.id, - flickr_owner = p.owner, - flickr_server = p.server, - flickr_secret = p.secret, - flickr_originalsecret = tags.photo.originalsecret, - flickr_farm = p.farm, - pub_date = flickr_datetime_to_datetime(p.datetaken), - description = force_unicode(tags.photo.description.PCDATA), - exif_aperture = aperture, - exif_make = make, - exif_model = model, - exif_shutter = exposure, - exif_iso = iso, - exif_lens = length, - exif_date = dto, - gps = force_unicode(p.latitude)+","+force_unicode(p.longitude), - place = place, - tags = str(", ".join(t.raw for t in tags.photo.tags.tag)).lower() - ) - make_local_size(photo) - #if (dupe): - #break - -from locations.models import Location -from photos.models import Photo -from django.contrib.gis.geos import Point - -def find_loc(photos): - for photo in photos: - p = Point(photo.lon, photo.lat, srid=4326) - try: - loc = Location.objects.filter(geometry__contains=p).get() - photo.location = loc - print photo.id - photo.save() - except Location.DoesNotExist: - print "photo %s does not fall within any exisiting location" %(photo.id) -"""
\ No newline at end of file diff --git a/apps/photos/urls.py b/apps/photos/urls.py deleted file mode 100644 index d917d85..0000000 --- a/apps/photos/urls.py +++ /dev/null @@ -1,13 +0,0 @@ -from django.conf.urls.defaults import * -from django.views.generic import list_detail -from django.views.generic.simple import redirect_to - - - -urlpatterns = patterns('', - (r'data/(?P<slug>[-\w]+)/$', 'photos.views.photo_json'), - (r'galleries/(?P<slug>[-\w]+)/$', 'photos.views.gallery'), - (r'(?P<page>\d+)/$', 'photos.views.gallery_list'), - (r'(?P<slug>[-\w]+)/$', redirect_to, {'url': '/photos/%(slug)s/1/'}), - (r'', redirect_to, {'url': '/photos/1/'}), -)
\ No newline at end of file diff --git a/apps/photos/views.py b/apps/photos/views.py deleted file mode 100644 index 3edfccb..0000000 --- a/apps/photos/views.py +++ /dev/null @@ -1,50 +0,0 @@ -from django.shortcuts import render_to_response,get_object_or_404 -from django.template import RequestContext -from django.views.generic.list_detail import object_list -from django.http import Http404,HttpResponse -from django.core import serializers - - -from photos.models import Photo,PhotoGallery -from locations.models import Country, Region - - - -def gallery_list(request,page): - request.page_url = '/photos/%d/' - request.page = int(page) - qs = PhotoGallery.objects.all() - return object_list(request, queryset=qs, template_name='archives/photos.html',extra_context={'page':page,}) - -def gallery(request,slug): - context = { - 'object': PhotoGallery.objects.get(set_slug=slug) - } - return render_to_response('details/photo_galleries.html', context, context_instance = RequestContext(request)) - -def photo_json(request, slug): - p = PhotoGallery.objects.filter(set_slug=slug) - return HttpResponse(serializers.serialize('json', p), mimetype='application/json') - -""" -Grabs entries by region or country -""" -def gallery_list_by_area(request,slug,page): - request.page_url = '/photos/'+slug+'/%d/' - request.page = int(page) - try: - region = Region.objects.get(slug__exact=slug) - qs = PhotoGallery.objects.filter(region = region).order_by('-id') - except: - region = Country.objects.get(slug__exact=slug) - qs = PhotoGallery.objects.filter(location__state__country = region).order_by('-id') - if not region: - raise Http404 - context = { - 'region': region, - 'country_list': Country.objects.filter(visited=True), - 'region_list': Region.objects.all(), - 'page': page - } - return object_list(request, queryset=qs, template_name='archives/photos.html', - extra_context=context) |