X-Git-Url: http://git.ithinksw.org/philo.git/blobdiff_plain/21abe382ad825e1383dfb1299efc1201ddd1e1c0..eb9fa984fe3e1aaa8e87e90d0d2d70b1fedb0887:/philo/models/nodes.py?ds=sidebyside

diff --git a/philo/models/nodes.py b/philo/models/nodes.py
index 5de7338..830f94a 100644
--- a/philo/models/nodes.py
+++ b/philo/models/nodes.py
@@ -1,4 +1,6 @@
 from inspect import getargspec
+import mimetypes
+from os.path import basename
 
 from django.contrib.contenttypes import generic
 from django.contrib.contenttypes.models import ContentType
@@ -29,24 +31,30 @@ class Node(SlugTreeEntity):
 	:class:`Node`\ s are the basic building blocks of a website using Philo. They define the URL hierarchy and connect each URL to a :class:`View` subclass instance which is used to generate an HttpResponse.
 	
 	"""
-	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter)
-	view_object_id = models.PositiveIntegerField()
+	view_content_type = models.ForeignKey(ContentType, related_name='node_view_set', limit_choices_to=_view_content_type_limiter, blank=True, null=True)
+	view_object_id = models.PositiveIntegerField(blank=True, null=True)
 	#: :class:`GenericForeignKey` to a non-abstract subclass of :class:`View`
 	view = generic.GenericForeignKey('view_content_type', 'view_object_id')
 	
 	@property
 	def accepts_subpath(self):
 		"""A property shortcut for :attr:`self.view.accepts_subpath <View.accepts_subpath>`"""
-		if self.view:
-			return self.view.accepts_subpath
+		if self.view_object_id and self.view_content_type_id:
+			return ContentType.objects.get_for_id(self.view_content_type_id).model_class().accepts_subpath
 		return False
 	
 	def handles_subpath(self, subpath):
-		return self.view.handles_subpath(subpath)
+		if self.view_object_id and self.view_content_type_id:
+			return ContentType.objects.get_for_id(self.view_content_type_id).model_class().handles_subpath(subpath)
+		return False
 	
 	def render_to_response(self, request, extra_context=None):
 		"""This is a shortcut method for :meth:`View.render_to_response`"""
-		return self.view.render_to_response(request, extra_context)
+		if self.view_object_id and self.view_content_type_id:
+			view_model = ContentType.objects.get_for_id(self.view_content_type_id).model_class()
+			self.view = view_model._default_manager.select_related(depth=1).get(pk=self.view_object_id)
+			return self.view.render_to_response(request, extra_context)
+		raise Http404
 	
 	def get_absolute_url(self, request=None, with_domain=False, secure=False):
 		"""
@@ -120,12 +128,13 @@ class View(Entity):
 	#: A generic relation back to nodes.
 	nodes = generic.GenericRelation(Node, content_type_field='view_content_type', object_id_field='view_object_id')
 	
-	#: Property or attribute which defines whether this :class:`View` can handle subpaths. Default: ``False``
+	#: An attribute on the class which defines whether this :class:`View` can handle subpaths. Default: ``False``
 	accepts_subpath = False
 	
-	def handles_subpath(self, subpath):
+	@classmethod
+	def handles_subpath(cls, subpath):
 		"""Returns True if the :class:`View` handles the given subpath, and False otherwise."""
-		if not self.accepts_subpath and subpath != "/":
+		if not cls.accepts_subpath and subpath != "/":
 			return False
 		return True
 	
@@ -220,15 +229,6 @@ class MultiView(View):
 		"""Returns urlpatterns that point to views (generally methods on the class). :class:`MultiView`\ s can be thought of as "managing" these subpaths."""
 		raise NotImplementedError("MultiView subclasses must implement urlpatterns.")
 	
-	def handles_subpath(self, subpath):
-		if not super(MultiView, self).handles_subpath(subpath):
-			return False
-		try:
-			resolve(subpath, urlconf=self)
-		except Http404:
-			return False
-		return True
-	
 	def actually_render_to_response(self, request, extra_context=None):
 		"""
 		Resolves the remaining subpath left after finding this :class:`View`'s node using :attr:`self.urlpatterns <urlpatterns>` and renders the view function (or method) found with the appropriate args and kwargs.
@@ -370,23 +370,32 @@ class Redirect(TargetURLModel, View):
 
 class File(View):
 	"""Stores an arbitrary file."""
-	#: Defines the mimetype of the uploaded file. This will not be validated.
-	mimetype = models.CharField(max_length=255)
+	#: The name of the uploaded file. This is meant for finding the file again later, not for display.
+	name = models.CharField(max_length=255)
+	#: Defines the mimetype of the uploaded file. This will not be validated. If no mimetype is provided, it will be automatically generated based on the filename.
+	mimetype = models.CharField(max_length=255, blank=True)
 	#: Contains the uploaded file. Files are uploaded to ``philo/files/%Y/%m/%d``.
 	file = models.FileField(upload_to='philo/files/%Y/%m/%d')
 	
+	def clean(self):
+		if not self.mimetype:
+			self.mimetype = mimetypes.guess_type(self.file.name, strict=False)[0]
+			if self.mimetype is None:
+				raise ValidationError("Unknown file type.")
+	
 	def actually_render_to_response(self, request, extra_context=None):
 		wrapper = FileWrapper(self.file)
 		response = HttpResponse(wrapper, content_type=self.mimetype)
 		response['Content-Length'] = self.file.size
+		response['Content-Disposition'] = "inline; filename=%s" % basename(self.file.name)
 		return response
 	
 	class Meta:
 		app_label = 'philo'
 	
 	def __unicode__(self):
-		"""Returns the path of the uploaded file."""
-		return self.file.name
+		"""Returns the value of :attr:`File.name`."""
+		return self.name
 
 
 register_value_model(Node)
\ No newline at end of file