diff options
Diffstat (limited to 'app/builder')
| -rw-r--r-- | app/builder/admin.py | 12 | ||||
| -rw-r--r-- | app/builder/base.py | 236 | ||||
| -rw-r--r-- | app/builder/views.py | 101 |
3 files changed, 163 insertions, 186 deletions
diff --git a/app/builder/admin.py b/app/builder/admin.py index ee6957e..4dccd80 100644 --- a/app/builder/admin.py +++ b/app/builder/admin.py @@ -17,7 +17,7 @@ class EntryAdmin(OSMGeoAdmin): else: field = super(EntryAdmin,self).formfield_for_dbfield(db_field,**kwargs) return field - list_display = ('title', 'pub_date','enable_comments', 'status','region','location','photo_gallery') + list_display = ('title', 'pub_date','enable_comments', 'status','region','location','photo_gallery') search_fields = ['title', 'body_markdown'] prepopulated_fields = {"slug" : ('title',)} list_filter = ('pub_date', 'enable_comments', 'status','region','location') @@ -25,7 +25,7 @@ class EntryAdmin(OSMGeoAdmin): ('Entry', {'fields': ('title','body_markdown', ('location','region'), 'pub_date', ('status','enable_comments'), 'slug','photo_gallery'), 'classes': ('show','extrapretty','wide')}), ('Pub Location', {'fields': ('point',('image','thumbnail',),'dek', 'topics', 'meta_description','template_name'), 'classes': ('collapse', 'wide')}), ) - + class Media: js = ['/media/admin/custom/model.js'] extra_js = [GMAP.api_url + GMAP.key] @@ -35,7 +35,7 @@ class EntryAdmin(OSMGeoAdmin): # Uncomment and modify as desired # To learn more about this jargon visit: # www.openlayers.org - + default_lon = -9314310 default_lat = 3991847 default_zoom = 6 @@ -65,16 +65,16 @@ class EntryAdmin(OSMGeoAdmin): #debug = False #widget = OpenLayersWidget - + class PostImageAdmin(admin.ModelAdmin): list_display = ('title', 'output_tags') - + class TopicAdmin(admin.ModelAdmin): list_display = ('name', 'slug') admin.site.register(Topic, TopicAdmin) -admin.site.register(PostImage, PostImageAdmin) +admin.site.register(PostImage, PostImageAdmin) admin.site.register(Entry, EntryAdmin) diff --git a/app/builder/base.py b/app/builder/base.py index d626505..9cd5af7 100644 --- a/app/builder/base.py +++ b/app/builder/base.py @@ -9,45 +9,46 @@ from django.conf import settings class Build(): - def write_file(self, path, object, ext='html',filename='index'): + def write_file(self, path, text_object, ext='html', filename='index'): """ Given a path and object intended to be a webpage, write the page the disc """ - path = '%s%s' %(settings.FLATFILES_ROOT, path) + path = '%s%s' % (settings.FLATFILES_ROOT, path) if not os.path.isdir(path): os.makedirs(path) - fpath = '%s%s.%s' %(path, filename, ext) - file = open(fpath, 'w') - file.write(object) + fpath = '%s%s.%s' % (path, filename, ext) + file = open(fpath, 'wb') + file.write(text_object) file.close() if ext == 'js': import jsmin - compressed = jsmin.jsmin(object) - fpath = '%s%s.min.%s' %(path, filename, ext) - file = open(fpath, 'w') - file.write(compressed) + compressed = jsmin.jsmin(str(text_object)) + fpath = '%s%s.min.%s' % (path, filename, ext) + file = open(fpath, 'wb') + file.write(bytes(compressed, 'UTF-8')) file.close() def build_archive_pages(self, qs=None, base_path='', paginate_by=10): """ - Archive Page builder that actually crawls the urls + Archive Page builder that actually crawls the urls because we need to be able to pass a request object to the template - + """ - if qs == None: + if qs is None: qs = self.get_model_querset() c = Client() - pages = ceil(Decimal(qs.count())/Decimal(paginate_by)) + pages = ceil(Decimal(qs.count()) / Decimal(paginate_by)) for page in range(int(pages)): - path = '%s%s/' %(base_path, page+1) - url = '/%s%s/' %(base_path, str(page+1)) - page_url = base_path+'%d/' - response = c.post(url, {'page_url': page_url, 'page': int(page), 'builder':True }) + path = '%s%s/' % (base_path, page + 1) + url = '/%s%s/' % (base_path, str(page + 1)) + page_url = base_path + '%d/' + response = c.post(url, {'page_url': page_url, 'page': int(page), 'builder': True}) if page == 0: - self.write_file(base_path,str(response.content)) - self.write_file(path,str(response.content)) - + self.write_file(base_path, response.content) + self.write_file(path, response.content) + + class BuildWriting(Build): def build(self): self.build_detail_pages() @@ -62,55 +63,54 @@ class BuildWriting(Build): model = get_model('blog', 'entry') qs = model.objects.filter(status__exact=1) return qs - + def build_detail_pages(self): ''' Grab all the blog posts, render them to a template string and write that out to the filesystem ''' qs = self.get_model_querset() for entry in qs: - c = Context({'object':entry,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('details/entry.html',c).encode('utf-8') - path = '%s/%s/' %(entry.pub_date.strftime("%Y/%b/%d").lower(), entry.slug) - self.write_file(path,t) - s = render_to_string('details/entry.txt',c).encode('utf-8') - self.write_file(path,s,'txt') - + c = Context({'object': entry, 'MEDIA_URL': settings.BAKED_MEDIA_URL, 'IMAGES_URL': settings.BAKED_IMAGES_URL}) + t = render_to_string('details/entry.html', c).encode('utf-8') + path = '%s/%s/' % (entry.pub_date.strftime("%Y/%b/%d").lower(), entry.slug) + self.write_file(path, t) + s = render_to_string('details/entry.txt', c).encode('utf-8') + self.write_file(path, s, 'txt') def build_writing_archives(self): qs = self.get_model_querset() self.build_archive_pages(qs, 'writing/') - + def build_region_archive_pages(self): - model = get_model('locations', 'Region') + model = get_model('locations', 'Region') blog = get_model('blog', 'entry') regions = model.objects.all() for c in regions: - qs = blog.objects.filter(status__exact=1,location__state__country__region = c.id).order_by('-pub_date') - path = 'writing/%s/' %(c.slug) + qs = blog.objects.filter(status__exact=1, location__state__country__region=c.id).order_by('-pub_date') + path = 'writing/%s/' % (c.slug) self.build_archive_pages(qs, path) def build_country_archive_pages(self): - model = get_model('locations', 'Country') + model = get_model('locations', 'Country') blog = get_model('blog', 'entry') countries = model.objects.filter(visited=True) for c in countries: - qs = blog.objects.filter(status__exact=1,location__state__country = c).order_by('-pub_date') - path = 'writing/%s/' %(c.slug) + qs = blog.objects.filter(status__exact=1, location__state__country=c).order_by('-pub_date') + path = 'writing/%s/' % (c.slug) self.build_archive_pages(qs, path) - + def writing_year_archives(self): entry = get_model('blog', 'entry') years = entry.objects.dates('pub_date', 'year') for year in years: year = year.strftime('%Y') - qs = entry.objects.filter(status__exact=1,pub_date__year=year).order_by('-pub_date') - c = Context({'type':'year','date': year, 'object_list':qs,}) - t = render_to_string('archives/writing_date.html',c).encode('utf-8') - fpath = '%s/' %(year) - self.write_file(fpath,t) + qs = entry.objects.filter(status__exact=1, pub_date__year=year).order_by('-pub_date') + c = Context({'type': 'year', 'date': year, 'object_list': qs}) + t = render_to_string('archives/writing_date.html', c).encode('utf-8') + fpath = '%s/' % (year) + self.write_file(fpath, t) - def writing_month_archives(self): + def writing_month_archives(self): entry = get_model('blog', 'entry') months = entry.objects.dates('pub_date', 'month') for m in months: @@ -118,34 +118,39 @@ class BuildWriting(Build): month = m.strftime('%m') month_name = m.strftime('%b') month_full_name = m.strftime('%B') - qs = entry.objects.filter(status__exact=1,pub_date__year=year,pub_date__month=month).order_by('-pub_date') - c = Context({'type':'monthly','date': '%s %s' %(month_full_name,year), 'object_list':qs,}) - t = render_to_string('archives/writing_date.html',c).encode('utf-8') - fpath = '%s/%s/' %(year,month_name) - self.write_file(fpath,t) - + qs = entry.objects.filter(status__exact=1, pub_date__year=year, + pub_date__month=month).order_by('-pub_date') + c = Context({'type': 'monthly', 'date': '%s %s' % ( + month_full_name, year), 'object_list': qs, }) + t = render_to_string('archives/writing_date.html', c).encode('utf-8') + fpath = '%s/%s/' % (year, month_name) + self.write_file(fpath, t) + def build_homepage(self): qs = get_model('blog', 'entry').objects.filter(status__exact=1)[:4] - c = Context({'object_list':qs,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('archives/homepage.html',c).encode('utf-8') - self.write_file('',t) + c = Context({'object_list': qs, 'MEDIA_URL': settings.BAKED_MEDIA_URL, 'IMAGES_URL': settings.BAKED_IMAGES_URL}) + t = render_to_string('archives/homepage.html', c).encode('utf-8') + self.write_file('', t) + class BuildPhotos(Build): def build(self): self.build_photo_archive_pages() self.build_detail_pages() - + def build_photo_archive_pages(self): qs = get_model('photos', 'PhotoGallery').objects.all() self.build_archive_pages(qs, 'photos/', 18) - + def build_detail_pages(self): qs = get_model('photos', 'PhotoGallery').objects.all() for photo in qs: - c = Context({'object':photo,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('details/photo_galleries.html',c).encode('utf-8') - path = 'photos/galleries/%s/' %(photo.set_slug) - self.write_file(path,t) + c = Context({'object': photo, 'MEDIA_URL': + settings.BAKED_MEDIA_URL, 'IMAGES_URL': settings.BAKED_IMAGES_URL}) + t = render_to_string('details/photo_galleries.html', c).encode('utf-8') + path = 'photos/galleries/%s/' % (photo.set_slug) + self.write_file(path, t) + class BuildProjects(Build): def build(self): @@ -158,16 +163,17 @@ class BuildProjects(Build): all_proj = [] projects = get_model('projects', 'Project').objects.filter(status__exact=1).order_by('-pub_date') for proj in projects: - row = {'slug':proj.slug, 'name':proj.model_name} + row = {'slug': proj.slug, 'name': proj.model_name} all_proj.append(row) return all_proj - + def build_project_archive(self): qs = get_model('projects', 'Project').objects.filter(status__exact=1).order_by('-pub_date') - c = Context({'object_list': qs,'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('archives/projects.html', c).encode('utf-8') - self.write_file('projects/',t) - + c = Context({'object_list': qs, 'MEDIA_URL': settings.BAKED_MEDIA_URL, + 'IMAGES_URL': settings.BAKED_IMAGES_URL}) + t = render_to_string('archives/projects.html', c).encode('utf-8') + self.write_file('projects/', t) + def build_project_details(self): projects = self.get_projects() for proj in projects: @@ -176,11 +182,15 @@ class BuildProjects(Build): qs = model.objects.filter(visited__exact=True).order_by("-date_visited_begin") else: qs = model.objects.filter(status__exact=1) - c = Context({'object_list': qs,'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('details/%s.html' %(proj['slug']), c).encode('utf-8') - path = 'projects/%s/' %(proj['slug']) - self.write_file(path,t) - + c = Context({ + 'object_list': qs, + 'MEDIA_URL': settings.BAKED_MEDIA_URL, + 'IMAGES_URL': settings.BAKED_IMAGES_URL + }) + t = render_to_string('details/%s.html' % (proj['slug']), c).encode('utf-8') + path = 'projects/%s/' % (proj['slug']) + self.write_file(path, t) + """ not sure how to handle projects really, the above doesn't work and if I just keep writing if/else statements that gets messy, so I guess @@ -189,13 +199,14 @@ class BuildProjects(Build): def build_gifs(self): qs = get_model('projects', 'AnimatedGif').objects.all() for gif in qs: - c = Context({'object':gif,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('details/gifs.html',c).encode('utf-8') - path = 'projects/gifs/%s/' %(gif.slug) - self.write_file(path,t) - - - + c = Context({ + 'object': gif, + 'MEDIA_URL': settings.BAKED_MEDIA_URL, + 'IMAGES_URL': settings.BAKED_IMAGES_URL + }) + t = render_to_string('details/gifs.html', c).encode('utf-8') + path = 'projects/gifs/%s/' % (gif.slug) + self.write_file(path, t) def build_project_data(self): from projects.shortcuts import render_to_geojson @@ -204,29 +215,32 @@ class BuildProjects(Build): qs = model.objects.filter(pk=park.id) json = render_to_geojson( qs, - included_fields=['id',], + included_fields=['id'], geom_attribute='mpoly', - mimetype = 'application/json', - ) + mimetype='application/json', + ) json = str(json) - json ="\n".join(json.splitlines()[3:]) + json = "\n".join(json.splitlines()[3:]) #print json path = 'projects/data/natparks/' - self.write_file(path, json, 'json', park.id) + self.write_file(path, bytes(json, 'UTF-8'), 'json', park.id) + class BuildSitemap(Build): def build(self): c = Client() response = c.get('/sitemap.xml') - self.write_file('',str(response.content), 'xml','sitemap') + self.write_file('', response.content, 'xml', 'sitemap') + class BuildWritingFeed(Build): def build(self): qs = get_model('blog', 'entry').objects.filter(status__exact=1).order_by('-pub_date')[:20] - c = Context({'object_list':qs,'SITE_URL':settings.SITE_URL}) - t = render_to_string('feed.xml',c).encode('utf-8') - fpath = '%s' %('rss/',) - self.write_file(fpath,t,'xml') + c = Context({'object_list': qs, 'SITE_URL': settings.SITE_URL}) + t = render_to_string('feed.xml', c).encode('utf-8') + fpath = '%s' % ('rss/',) + self.write_file(fpath, t, 'xml') + class BuildMap(Build): def build(self): @@ -234,36 +248,48 @@ class BuildMap(Build): cl = get_model('locations', 'Country').objects.filter(visited=True).exclude(name='default') rl = get_model('locations', 'Region').objects.all() rtl = get_model('locations', 'Route').objects.all() - c = Context({'object_list':qs, 'country_list':cl,'region_list':rl, 'route_list':rtl, 'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('archives/map_data.html',c).encode('utf-8') - self.write_file('media/js/',t, 'js','mainmap') - c = Context({'country_list':cl,'region_list':rl,'route_list':rtl,'MEDIA_URL':settings.BAKED_MEDIA_URL, 'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string('archives/map.html',c).encode('utf-8') - self.write_file('map/',t) - + c = Context({ + 'object_list': qs, + 'country_list': cl, + 'region_list': rl, + 'route_list': rtl, + 'MEDIA_URL': settings.BAKED_MEDIA_URL, + 'IMAGES_URL': settings.BAKED_IMAGES_URL + }) + t = render_to_string('archives/map_data.html', c).encode('utf-8') + self.write_file('media/js/', t, 'js', 'mainmap') + c = Context({ + 'country_list': cl, + 'region_list': rl, + 'route_list': rtl, + 'MEDIA_URL': settings.BAKED_MEDIA_URL, + 'IMAGES_URL': settings.BAKED_IMAGES_URL + }) + t = render_to_string('archives/map.html', c).encode('utf-8') + self.write_file('map/', t) + + class BuildPages(Build): def build(self): model = get_model('pages', 'page') pages = model.objects.all() for page in pages: - c = Context({'object':page,'SITE_URL':settings.SITE_URL, 'MEDIA_URL':settings.BAKED_MEDIA_URL,'IMAGES_URL':settings.BAKED_IMAGES_URL}) - t = render_to_string(["details/%s.html" % page.slug, 'details/page.html'],c).encode('utf-8') - s = render_to_string('details/page.txt',c).encode('utf-8') - fpath = '%s/' %(page.slug) - self.write_file(fpath,t) - self.write_file(fpath,s,'txt') - + c = Context({'object': page, 'SITE_URL': settings.SITE_URL, 'MEDIA_URL': + settings.BAKED_MEDIA_URL, 'IMAGES_URL': settings.BAKED_IMAGES_URL}) + t = render_to_string( + ["details/%s.html" % page.slug, 'details/page.html'], c).encode('utf-8') + s = render_to_string('details/page.txt', c).encode('utf-8') + fpath = '%s/' % (page.slug) + self.write_file(fpath, t) + self.write_file(fpath, s, 'txt') class BuildContact(Build): def build(self): c = Client() response = c.get('/contact/') - path = '%scontact/' %(settings.BAKED_ROOT) + path = '%scontact/' % (settings.BAKED_ROOT) if not os.path.isdir(path): os.makedirs(path) - fpath = '%sindex.html' %(path) - self.write_file(fpath,str(response.content)) - -#class BuildCodeSite(Build): - + fpath = '%sindex.html' % (path) + self.write_file(fpath, response.content) diff --git a/app/builder/views.py b/app/builder/views.py index ca1296f..c0b8125 100644 --- a/app/builder/views.py +++ b/app/builder/views.py @@ -1,81 +1,32 @@ -from django.http import HttpResponseRedirect -from django.core.urlresolvers import reverse -from django.shortcuts import render_to_response,get_object_or_404,redirect - +from django.shortcuts import render_to_response from django.template import RequestContext +from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPages, BuildPhotos, BuildProjects, BuildSitemap, BuildContact + +options = { + 'writing': BuildWriting, + 'photo_galleries': BuildPhotos, + 'projects': BuildProjects, + 'pages': BuildPages, + 'map': BuildMap, + 'feed': BuildWritingFeed, + 'sitemap': BuildSitemap, +} -from builder.base import BuildWriting, BuildWritingFeed, BuildMap, BuildPages, BuildPhotos,BuildProjects,BuildSitemap,BuildContact def do_build(request): section = request.GET.get('id', '') - if section != '': - - #build writing archives - if section == 'writing': - BuildWriting().build() - context = {'message': 'Writing Posts to Disk',} - - #build photo galleries - elif section == 'photos': - BuildPhotos().build() - context = {'message': 'Writing Photo Galleries to Disk',} - - #build project pages - elif section == 'projects': - BuildProjects().build() - context = {'message': 'Writing Project pages to Disk',} - - #build pages - elif section == 'pages': - BuildPages().build() - context = {'message': 'Writing Pages to Disk',} - - #build map - elif section == 'map': - BuildMap().build() - context = {'message': 'Writing Map to Disk',} - - #build Writing RSS Feed - elif section == 'feed': - BuildWritingFeed().build() - context = {'message': 'Writing RSS Feed to Disk',} - - #build Sitemap - elif section == 'sitemap': - BuildSitemap().build() - context = {'message': 'Writing Sitemap to Disk',} - - #build Everything need for new post - elif section == 'newpost': - #build writing archives/details pages/homepage - BuildWriting().build() - #build map - BuildMap().build() - #build feed - BuildWritingFeed().build() - #build sitemap - BuildSitemap().build() - context = {'message': 'Publishing New Post',} - - #build Homepage - elif section == 'home': - BuildWriting().build_homepage() - context = {'message': 'Writing Homepage to Disk',} - #Crawl Flickr for new Photosets - elif section == 'scrapeflickr': - from photos import retriever - retriever.sync_sets() - context = {'message': 'Crawling Flickr for new photosets',} - """ - elif section == 'all': - g.build_entire_site() - context = {'message': 'Writing Entire Site to disk',} - """ - + context = {} + if section == 'newpost': + BuildWriting().build() + BuildMap().build() + BuildWritingFeed().build() + BuildSitemap().build() + context = {'message': 'Writing %s to Disk' % section} + elif section == 'scrapeflickr': + from photos import retriever + retriever.sync_sets() + context = {'message': 'Crawling Flickr for new photosets'} else: - context = {} - #return redirect('/admin/', message='test') - return render_to_response('admin/message.html', context, context_instance = RequestContext(request)) - - - + options[section]().build() + context = {'message': 'Writing %s to Disk' % section} + return render_to_response('admin/message.html', context, context_instance=RequestContext(request)) |