Creator roles update

hmhrex · hmhrex · commit 3116dfeac806 · 2017-08-03T11:40:26.000-04:00
diff --git a/comics/admin.py b/comics/admin.py
@@ -1,6 +1,6 @@
 from django.contrib import admin
 from solo.admin import SingletonModelAdmin
-from .models import Arc, Character, Creator, Team, Publisher, Series, Issue, Settings
+from .models import Arc, Character, Creator, Team, Publisher, Series, Issue, Roles, Settings
 
 admin.site.site_header = 'Tenma'
 admin.site.site_title = 'Tenma'
@@ -12,4 +12,5 @@
 admin.site.register(Team)
 admin.site.register(Publisher)
 admin.site.register(Series)
-admin.site.register(Issue)
+admin.site.register(Issue)
+admin.site.register(Roles)
diff --git a/comics/migrations/0002_auto_20170802_1611.py b/comics/migrations/0002_auto_20170802_1611.py
@@ -0,0 +1,82 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.1 on 2017-08-02 20:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import multiselectfield.db.fields
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('comics', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Roles',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('roles', multiselectfield.db.fields.MultiSelectField(choices=[('artist', 'Artist'), ('colorist', 'Colorist'), ('cover', 'Cover'), ('editor', 'Editor'), ('inker', 'Inker'), ('journalist', 'Journalist'), ('letterer', 'Letterer'), ('other', 'Other'), ('penciler', 'Penciler'), ('production', 'Production'), ('writer', 'Writer')], max_length=87)),
+            ],
+        ),
+        migrations.AlterModelOptions(
+            name='series',
+            options={'verbose_name_plural': 'Series'},
+        ),
+        migrations.RemoveField(
+            model_name='issue',
+            name='creators',
+        ),
+        migrations.AlterField(
+            model_name='arc',
+            name='image',
+            field=models.FilePathField(blank=True, path='media/images', verbose_name='Image file path'),
+        ),
+        migrations.AlterField(
+            model_name='character',
+            name='image',
+            field=models.FilePathField(blank=True, path='media/images', verbose_name='Image file path'),
+        ),
+        migrations.AlterField(
+            model_name='creator',
+            name='image',
+            field=models.FilePathField(blank=True, path='media/images', verbose_name='Image file path'),
+        ),
+        migrations.AlterField(
+            model_name='issue',
+            name='cover',
+            field=models.FilePathField(blank=True, path='media/images', verbose_name='Cover file path'),
+        ),
+        migrations.AlterField(
+            model_name='issue',
+            name='cvid',
+            field=models.CharField(blank=True, max_length=15, verbose_name='ComicVine ID'),
+        ),
+        migrations.AlterField(
+            model_name='publisher',
+            name='logo',
+            field=models.FilePathField(blank=True, path='media/images', verbose_name='Logo file path'),
+        ),
+        migrations.AlterField(
+            model_name='series',
+            name='year',
+            field=models.PositiveSmallIntegerField(blank=True, choices=[(1837, 1837), (1838, 1838), (1839, 1839), (1840, 1840), (1841, 1841), (1842, 1842), (1843, 1843), (1844, 1844), (1845, 1845), (1846, 1846), (1847, 1847), (1848, 1848), (1849, 1849), (1850, 1850), (1851, 1851), (1852, 1852), (1853, 1853), (1854, 1854), (1855, 1855), (1856, 1856), (1857, 1857), (1858, 1858), (1859, 1859), (1860, 1860), (1861, 1861), (1862, 1862), (1863, 1863), (1864, 1864), (1865, 1865), (1866, 1866), (1867, 1867), (1868, 1868), (1869, 1869), (1870, 1870), (1871, 1871), (1872, 1872), (1873, 1873), (1874, 1874), (1875, 1875), (1876, 1876), (1877, 1877), (1878, 1878), (1879, 1879), (1880, 1880), (1881, 1881), (1882, 1882), (1883, 1883), (1884, 1884), (1885, 1885), (1886, 1886), (1887, 1887), (1888, 1888), (1889, 1889), (1890, 1890), (1891, 1891), (1892, 1892), (1893, 1893), (1894, 1894), (1895, 1895), (1896, 1896), (1897, 1897), (1898, 1898), (1899, 1899), (1900, 1900), (1901, 1901), (1902, 1902), (1903, 1903), (1904, 1904), (1905, 1905), (1906, 1906), (1907, 1907), (1908, 1908), (1909, 1909), (1910, 1910), (1911, 1911), (1912, 1912), (1913, 1913), (1914, 1914), (1915, 1915), (1916, 1916), (1917, 1917), (1918, 1918), (1919, 1919), (1920, 1920), (1921, 1921), (1922, 1922), (1923, 1923), (1924, 1924), (1925, 1925), (1926, 1926), (1927, 1927), (1928, 1928), (1929, 1929), (1930, 1930), (1931, 1931), (1932, 1932), (1933, 1933), (1934, 1934), (1935, 1935), (1936, 1936), (1937, 1937), (1938, 1938), (1939, 1939), (1940, 1940), (1941, 1941), (1942, 1942), (1943, 1943), (1944, 1944), (1945, 1945), (1946, 1946), (1947, 1947), (1948, 1948), (1949, 1949), (1950, 1950), (1951, 1951), (1952, 1952), (1953, 1953), (1954, 1954), (1955, 1955), (1956, 1956), (1957, 1957), (1958, 1958), (1959, 1959), (1960, 1960), (1961, 1961), (1962, 1962), (1963, 1963), (1964, 1964), (1965, 1965), (1966, 1966), (1967, 1967), (1968, 1968), (1969, 1969), (1970, 1970), (1971, 1971), (1972, 1972), (1973, 1973), (1974, 1974), (1975, 1975), (1976, 1976), (1977, 1977), (1978, 1978), (1979, 1979), (1980, 1980), (1981, 1981), (1982, 1982), (1983, 1983), (1984, 1984), (1985, 1985), (1986, 1986), (1987, 1987), (1988, 1988), (1989, 1989), (1990, 1990), (1991, 1991), (1992, 1992), (1993, 1993), (1994, 1994), (1995, 1995), (1996, 1996), (1997, 1997), (1998, 1998), (1999, 1999), (2000, 2000), (2001, 2001), (2002, 2002), (2003, 2003), (2004, 2004), (2005, 2005), (2006, 2006), (2007, 2007), (2008, 2008), (2009, 2009), (2010, 2010), (2011, 2011), (2012, 2012), (2013, 2013), (2014, 2014), (2015, 2015), (2016, 2016), (2017, 2017)], default=2017, verbose_name='year'),
+        ),
+        migrations.AlterField(
+            model_name='team',
+            name='image',
+            field=models.FilePathField(blank=True, path='media/images', verbose_name='Image file path'),
+        ),
+        migrations.AddField(
+            model_name='roles',
+            name='creator',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comics.Creator'),
+        ),
+        migrations.AddField(
+            model_name='roles',
+            name='issue',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='comics.Issue'),
+        ),
+    ]
diff --git a/comics/models.py b/comics/models.py
@@ -3,6 +3,7 @@
 import datetime,os,rarfile,zipfile,tarfile
 
 from shutil import copyfile
+from multiselectfield import MultiSelectField
 
 from django.db import models
 from solo.models import SingletonModel
@@ -13,10 +14,26 @@
 from .utils.comicfilehandler import ComicFileHandler
 
 """
-Create a choice for years
+Choices for model use.
 """
+# Generated years
 YEAR_CHOICES = [(r,r) for r in range(1837, datetime.date.today().year+1)]
 
+# Creator roles for an issue
+ROLE_CHOICES = (
+	('artist', 'Artist'),
+	('colorist', 'Colorist'),
+	('cover', 'Cover'),
+	('editor', 'Editor'),
+	('inker', 'Inker'),
+	('journalist', 'Journalist'),
+	('letterer', 'Letterer'),
+	('other', 'Other'),
+	('penciler', 'Penciler'),
+	('production', 'Production'),
+	('writer', 'Writer'),
+)
+
 class Settings(SingletonModel):
 	api_key = models.CharField(
 		'ComicVine API Key',
@@ -111,7 +128,6 @@ class Issue(models.Model):
 	desc = models.TextField('Description', max_length=500, blank=True)
 	arcs = models.ManyToManyField(Arc, blank=True)
 	characters = models.ManyToManyField(Character, blank=True)
-	creators = models.ManyToManyField(Creator, blank=True)
 	teams = models.ManyToManyField(Team, blank=True)
 	file = models.FilePathField('File path', path="files/", recursive=True)
 	cover = models.FilePathField('Cover file path', path="media/images", blank=True)
@@ -126,4 +142,15 @@ def page_set(self):
 		comicfilehandler = ComicFileHandler()
 		comic = comicfilehandler.extract_comic(self.file, self.id)
 
-		return comic
+		return comic
+
+class Roles(models.Model):
+	creator = models.ForeignKey(Creator, on_delete=models.CASCADE)
+	issue = models.ForeignKey(Issue, on_delete=models.CASCADE)
+	roles = MultiSelectField(choices=ROLE_CHOICES)
+
+	def __str__(self):
+		return self.issue.series.name + ' #' + str(self.issue.number) + ' - ' + self.creator.name
+
+	class Meta:
+		verbose_name_plural = "Roles"
diff --git a/comics/templates/comics/issue.html b/comics/templates/comics/issue.html
@@ -50,7 +50,7 @@ <h3>Issue #{{ issue.number }}{% if issue.name %} - <i>{{ issue.name }}</i>{% end
 
 {% include "comics/related_characters.html" with character_list=issue.characters.all %}
 
-{% include "comics/related_creators.html" with creator_list=issue.creators.all %}
+{% include "comics/related_creators.html" with roles_list=roles_list.all %}
 
 {% include "comics/related_teams.html" with team_list=issue.teams.all %}
 <script>
@@ -64,4 +64,4 @@ <h3>Issue #{{ issue.number }}{% if issue.name %} - <i>{{ issue.name }}</i>{% end
         });
     })
 </script>
-{% endblock content %}
+{% endblock content %}
diff --git a/comics/templates/comics/related_creators.html b/comics/templates/comics/related_creators.html
@@ -1,26 +1,27 @@
 {% load simple_crop %}
 {% load staticfiles %}
 
-{% if creator_list %}
+{% if roles_list %}
 <div class="related related-creators">
 	<h2>Creators</h2>
 	<div class="flexslider related-slider">
 		<ul class="slides">
-			{% for creator in creator_list %}
+			{% for roles in roles_list %}
 			<li>
-				<a href="{% url 'comics:creator' creator.id %}">
+				<a href="{% url 'comics:creator' roles.creator.id %}">
 					<div class="image">
-					{% if creator.image %}
-						<img src="{{ creator.image|smartcrop:"200x305"|urlencode }}" alt="{{ creator.name }}" >
+					{% if roles.creator.image %}
+						<img src="{{ roles.creator.image|smartcrop:"200x305"|urlencode }}" alt="{{ roles.creator.name }}" >
 					{% else %}
-						<img src="{% static 'comics/image-not-found.png' %}" alt="{{ creator.name }}" >
+						<img src="{% static 'comics/image-not-found.png' %}" alt="{{ roles.creator.name }}" >
 					{% endif %}
 					</div>
 				</a>
-				<a href="{% url 'comics:creator' creator.id %}"><p>{{ creator.name }}</p></a>
+				<a href="{% url 'comics:creator' roles.creator.id %}"><p>{{ roles.creator.name }}</p></a>
+				<p><small><em>{{ roles.roles }}</em></small></p>
 			</li>
 			{% endfor %}
 		</ul>
 	</div>
 </div>
-{% endif %}
+{% endif %}
diff --git a/comics/utils/comicimporter.py b/comics/utils/comicimporter.py
@@ -1,7 +1,7 @@
 import json, os, time, datetime, re, requests, requests_cache
 from urllib.request import urlretrieve
 from urllib.parse import quote_plus, unquote_plus
-from comics.models import Arc, Character, Creator, Team, Publisher, Series, Issue, Settings
+from comics.models import Arc, Character, Creator, Team, Publisher, Series, Issue, Roles, Settings
 from .comicfilehandler import ComicFileHandler
 from . import fnameparser, utils
 
@@ -464,9 +464,14 @@ def _process_issue(self, filename, cvid):
 		for person in response_issue['results']['person_credits']:
 			matching_creator = Creator.objects.filter(cvid=person['id'])
 			if not matching_creator:
-				self._create_creator(person['api_detail_url'], issue.id)
+				self._create_creator(person['api_detail_url'], re.sub(' ', '', person['role']), issue.id)
 			else:
-				issue.creators.add(self._update_creator(matching_creator[0].id, person['api_detail_url']))
+				#TODO: Create many-to-many relationship through Role
+				Roles.objects.create(
+					creator=matching_creator[0],
+					issue=issue,
+					roles=re.sub(' ', '', person['role'])
+				)
 
 		# 8. Set Teams
 		for team in response_issue['results']['team_credits']:
@@ -734,7 +739,7 @@ def _create_character(self, api_url, issue_id):
 
 	#==================================================================================================
 
-	def _create_creator(self, api_url, issue_id):
+	def _create_creator(self, api_url, roles, issue_id):
 		'''
 		Creates Creator from ComicVine API URL and adds it to
 		it's corresponding Issue.
@@ -757,14 +762,21 @@ def _create_creator(self, api_url, issue_id):
 		issue = Issue.objects.get(id=issue_id)
 
 		# Create Creator
-		cr = issue.creators.create(
+		cr = Creator.objects.create(
 			cvid=data['cvid'],
 			cvurl=data['cvurl'],
 			name=data['name'],
 			desc=data['desc'],
 			image=data['image'],
 		)
 
+		# Create Role in issue
+		r = Roles.objects.create(
+			creator=cr,
+			issue=issue,
+			roles=roles
+		)
+
 		return cr
 
 
@@ -1176,7 +1188,7 @@ def _reset_issue(self, obj_id):
 		issue.desc = ''
 		issue.arcs.clear()
 		issue.characters.clear()
-		issue.creators.clear()
+		Roles.objects.filter(issue=issue).delete()
 		issue.teams.clear()
 		issue.cover = ''
 
diff --git a/comics/views.py b/comics/views.py
@@ -2,7 +2,7 @@
 from django.views.generic import ListView, DetailView
 from django.views.generic.edit import UpdateView
 from django.http import HttpResponseRedirect
-from .models import Series, Issue, Character, Arc, Team, Publisher, Creator, Settings
+from .models import Series, Issue, Character, Arc, Team, Publisher, Creator, Settings, Roles
 from .tasks import import_comic_files_task, reprocess_issue_task
 from .utils.comicimporter import ComicImporter
 
@@ -20,7 +20,13 @@ class SeriesView(DetailView):
 class IssueView(DetailView):
 	model = Issue
 	template_name = 'comics/issue.html'
-	
+
+	def get_context_data(self, **kwargs):
+		context = super(IssueView, self).get_context_data(**kwargs)
+		issue = self.get_object()
+		context['roles_list'] = Roles.objects.filter(issue=issue)
+		return context
+
 class CharacterView(DetailView):
 	model = Character
 	template_name = 'comics/character.html'
@@ -62,7 +68,8 @@ class CreatorView(DetailView):
 	def get_context_data(self, **kwargs):
 		context = super(CreatorView, self).get_context_data(**kwargs)
 		creator = self.get_object()
-		context['issue_list'] = creator.issue_set.all().order_by('series__name', 'number')
+		roles = Roles.objects.filter(creator=creator)
+		context['issue_list'] = Issue.objects.filter(id__in=roles.values('issue_id'))
 		return context
 
 class ServerSettingsView(UpdateView):
@@ -96,4 +103,4 @@ def importer(request):
 
 def reprocess(request, issue_id):
 	reprocess_issue_task.delay(issue_id)
-	return HttpResponseRedirect('/issue/' + issue_id)
+	return HttpResponseRedirect('/issue/' + issue_id)
diff --git a/requirements.txt b/requirements.txt
@@ -3,6 +3,7 @@ anyjson==0.3.3
 billiard==3.3.0.23
 celery==3.1.23
 Django==1.10.1
+django-multiselectfield==0.1.7
 django-solo==1.1.2
 django-widget-tweaks==1.4.1
 kombu==3.0.35
