Skip to content

Commit 14a4ea1

Browse files
levkowetzlevkowetz
committed
Merged in ^/personal/rjs/6.21.1.dev0@11257
 - Legacy-Id: 11259
1 parent caf3a4c commit 14a4ea1

File tree

12 files changed

+410
-9
lines changed

12 files changed

+410
-9
lines changed

‎ietf/bin/2016-05-25-collect-photos.py‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
#!/usr/bin/env python
2+
3+
import os, sys, shutil, pathlib
4+
5+
# boilerplate
6+
basedir = os.path.abspath(os.path.join(os.path.dirname(__file__), "../web/"))
7+
sys.path = [ basedir ] + sys.path
8+
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "ietf.settings")
9+
10+
import django
11+
django.setup()
12+
13+
from ietf.group.models import Role
14+
15+
old_images_dir = os.path.join(django.conf.settings.OLD_PHOTOS_DIR,'wg/images/')
16+
new_images_dir = os.path.join(django.conf.settings.PHOTOS_DIR,django.conf.settings.PHOTO_URL_PREFIX)
17+
18+
old_image_files = []
19+
for (dirpath, dirnames, filenames) in os.walk(old_images_dir):
20+
old_image_files.extend(filenames)
21+
break # Only interested in the files in the top directory
22+
23+
old_image_files_lc = map(lambda x:x.lower(),old_image_files)
24+
25+
interesting_persons = set()
26+
27+
interesting_persons.update([r.person for r in Role.objects.filter(group__type='wg',group__state='active',name='chair')])
28+
interesting_persons.update([r.person for r in Role.objects.filter(group__type='rg',group__state='active',name='chair')])
29+
interesting_persons.update([r.person for r in Role.objects.filter(group__type='area',group__state='active',name_id='ad')])
30+
interesting_persons.update([r.person for r in Role.objects.filter(group__acronym='iab',name_id='member')])
31+
interesting_persons.update([r.person for r in Role.objects.filter(group__acronym='irtf',name_id='chair')])
32+
33+
#from ietf.person.models import Person
34+
#interesting_persons = Person.objects.filter(name__contains="Burman")
35+
36+
exceptions = {
37+
'Aboba' : 'aboba-bernard',
38+
'Bernardos' : 'cano-carlos',
39+
'Bormann' : 'bormann-carsten',
40+
'Wesley George' : 'george-wes',
41+
'Hinden' : 'hinden-bob',
42+
'Hutton' : 'hutton-andy',
43+
'Narten' : 'narten-thomas', # but there's no picture of him
44+
'O\'Donoghue' : 'odonoghue-karen',
45+
'Przygienda' : 'przygienda-antoni',
46+
'Salowey' : 'salowey-joe',
47+
'Patricia Thaler' : 'thaler-pat',
48+
'Gunter Van de Velde' : 'vandevelde-gunter',
49+
'Eric Vyncke' : 'vynke-eric',
50+
'Zuniga' : 'zuniga-carlos-juan',
51+
'Zhen Cao' : 'zhen-cao',
52+
53+
}
54+
55+
# Manually copied Bo Burman and Thubert Pascal from wg/photos/
56+
# Manually copied Victor Pascual (main image, not thumb) from wg/
57+
# Manually copied Eric Vync?ke (main image, not thumb) from wg/photos/
58+
# Manually copied Danial King (main image, not thumb) from wg/photos/
59+
# Manually copied the thumb (not labelled as such) for Tianran Zhou as both the main and thumb image from wg/photos/
60+
61+
62+
processed_files = []
63+
64+
for person in sorted(list(interesting_persons),key=lambda x:x.last_name()+x.ascii):
65+
substr_pattern = None
66+
for exception in exceptions:
67+
if exception in person.ascii:
68+
substr_pattern = exceptions[exception]
69+
break
70+
if not substr_pattern:
71+
name_parts = person.ascii.lower().split()
72+
substr_pattern = '-'.join(name_parts[-1:]+name_parts[0:1])
73+
74+
candidates = [x for x in old_image_files_lc if x.startswith(substr_pattern)]
75+
76+
# Fixup for other exceptional cases
77+
if person.ascii=="Lee Howard":
78+
candidates = candidates[:2] # strip howard-lee1.jpg
79+
80+
if person.ascii=="David Oran":
81+
candidates = ['oran-dave-th.jpg','oran-david.jpg']
82+
83+
if person.ascii=="Susan Hares":
84+
candidates = ['hares-sue-th.jpg','hares-susan.jpg']
85+
86+
if person.ascii=="Mahesh Jethanandani":
87+
candidates = ['mahesh-jethanandani-th.jpg','jethanandani-mahesh.jpg']
88+
89+
if len(candidates) not in [0,2]:
90+
candidates = [x for x in candidates if not '00' in x]
91+
92+
# At this point we either have no candidates or two. If two, the first will be the thumb
93+
94+
def original_case(name):
95+
return old_image_files[old_image_files_lc.index(name)]
96+
97+
def copy(old, new):
98+
global processed_files
99+
print("Copying", old, "to", new)
100+
shutil.copy(old, new)
101+
processed_files.append(old)
102+
103+
if len(candidates)==2:
104+
old_name = original_case(candidates[1])
105+
old_thumb_name = original_case(candidates[0])
106+
old_name_ext = os.path.splitext(old_name)[1]
107+
old_thumb_name_ext = os.path.splitext(old_thumb_name)[1]
108+
109+
new_name = person.photo_name(thumb=False)+old_name_ext.lower()
110+
new_thumb_name = person.photo_name(thumb=True)+old_thumb_name_ext.lower()
111+
112+
copy( os.path.join(old_images_dir,old_name), os.path.join(new_images_dir,new_name) )
113+
114+
#
115+
copy( os.path.join(old_images_dir,old_thumb_name), os.path.join(new_images_dir,new_thumb_name) )
116+
117+
118+
for file in pathlib.Path(old_images_dir).iterdir():
119+
if file.is_file():
120+
if not str(file) in processed_files:
121+
print("Not processed:", file.name)

‎ietf/group/urls_info.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,6 @@
1919
(r'^bofs/$', views.bofs),
2020
(r'^email-aliases/$', 'ietf.group.views.email_aliases'),
2121
(r'^bofs/create/$', views_edit.edit, {'action': "create"}, "bof_create"),
22+
(r'^chair-photos/$', views.chair_photos),
2223
(r'^(?P<acronym>[a-zA-Z0-9-._]+)/', include('ietf.group.urls_info_details')),
2324
)

‎ietf/group/views.py‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,3 +870,12 @@ def derived_archives(request, acronym=None, group_type=None):
870870
'group':group,
871871
'list_acronym':list_acronym,
872872
}))
873+
874+
def chair_photos(request, group_type=None):
875+
if not group_type=='wg':
876+
raise Http404
877+
chair_roles = sorted(Role.objects.filter(group__type='wg',group__state='active',name_id='chair'),key=lambda x: x.person.last_name()+x.person.name+x.group.acronym)
878+
for role in chair_roles:
879+
role.last_initial = role.person.last_name()[0]
880+
return render(request, 'group/chair_photos.html', {'chair_roles':chair_roles})
881+

‎ietf/nomcom/models.py‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
from django.db import models
55
from django.db.models.signals import post_delete
66
from django.conf import settings
7-
from django.core.files.storage import FileSystemStorage
87
from django.contrib.auth.models import User
98
from django.template.loader import render_to_string
109
from django.template.defaultfilters import linebreaks
@@ -22,6 +21,8 @@
2221
initialize_requirements_for_position,
2322
delete_nomcom_templates)
2423

24+
from ietf.utils.storage import NoLocationMigrationFileSystemStorage
25+
2526

2627
def upload_path_handler(instance, filename):
2728
return os.path.join(instance.group.acronym, 'public.cert')
@@ -32,14 +33,6 @@ class ReminderDates(models.Model):
3233
nomcom = models.ForeignKey('NomCom')
3334

3435

35-
class NoLocationMigrationFileSystemStorage(FileSystemStorage):
36-
37-
def deconstruct(obj):
38-
path, args, kwargs = FileSystemStorage.deconstruct(obj)
39-
kwargs["location"] = None
40-
return (path, args, kwargs)
41-
42-
4336
class NomCom(models.Model):
4437
public_key = models.FileField(storage=NoLocationMigrationFileSystemStorage(location=settings.NOMCOM_PUBLIC_KEYS_DIR),
4538
upload_to=upload_path_handler, blank=True, null=True)

‎ietf/person/migrations/0008_add_biography_field.py‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
# -*- coding: utf-8 -*-
2+
from __future__ import unicode_literals
3+
4+
from django.db import models, migrations
5+
6+
7+
class Migration(migrations.Migration):
8+
9+
dependencies = [
10+
('person', '0007_auto_20160520_0304'),
11+
]
12+
13+
operations = [
14+
migrations.AddField(
15+
model_name='person',
16+
name='biography',
17+
field=models.TextField(help_text=b'Short biography for use on leadership pages.', blank=True),
18+
preserve_default=True,
19+
),
20+
migrations.AddField(
21+
model_name='personhistory',
22+
name='biography',
23+
field=models.TextField(help_text=b'Short biography for use on leadership pages.', blank=True),
24+
preserve_default=True,
25+
),
26+
]

0 commit comments

Comments
 (0)