icma link

backup/backup_stills.command

@@ -1,61 +0,0 @@
-#!/usr/bin/env python3
-
-import json
-import os
-import sys
-import unicodedata
-import re
-
-import ox
-import ox.api
-
-
-if __name__ == '__main__':
-    if len(sys.argv) > 1:
-        target = sys.argv[1]
-    else:
-        target = os.path.join(os.path.dirname(os.path.abspath(__file__)), 'Stills')
-
-    if not target.endswith('/'):
-        target += '/'
-
-    site = 'pandora.cinemusespace.com'
-    api = ox.api.signin('https://%s/api/' % site)
-
-    keep = []
-    r = api.findAnnotations({
-        'query': {
-            'conditions': [
-                {'key': 'layer', 'operator': '==', 'value': 'stills'}
-            ]
-        },
-        'range': [0, 100000],
-        'keys': ['id', 'item', 'value', 'in', 'out', 'title', 'director', 'year']
-    })
-    for i in r['data']['items']:
-        img = re.compile('<img src="(.*)">').findall(i['value'])
-        if len(img) != 1:
-            print(img)
-            sys.exit(1)
-        lines = i['value'].strip().split('\n')
-        if len(lines) > 1:
-            tags = lines[1:]
-        else:
-            tags = []
-
-        name = i['title']
-        if i.get('year'):
-            name += '_(%s)' % i['year']
-        if i.get('director'):
-            name += '_' + ','.join(i['director'])
-        if tags:
-            name += '_' + ','.join(tags)
-
-        pos = float(re.compile('p(.*?).jpg').findall(img[0])[0])
-        name += '_%s.jpg' % ox.format_timecode(pos)
-        url = 'https://%s%s' % (site, img[0])
-        path = os.path.join(target, name)
-        if not os.path.exists(path):
-            print(url, name)
-            api.save_url(url, path)
-

config.jsonc

@@ -42,7 +42,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
         "canAddItems": {"staff": true, "admin": true},
         "canAddDocuments": {"staff": true, "admin": true},
         "canDownloadVideo": {"guest": 0, "member": 0, "visitor": 0, "staff": 1, "admin": 2},
-        "canDownloadSource": {"member": -1, "staff": 4, "admin": 4},
         "canEditAnnotations": {"staff": false, "admin": true},
         "canEditDocuments": {"staff": true, "admin": true},
         "canEditEntities": {"staff": true, "admin": true},
@@ -215,7 +214,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "type": "string",
             "columnWidth": 120,
             //"format": {"type": "date", "args": ["%a, %b %e, %Y"]},
-            "filter": true,
             "sort": true
         },
         {
@@ -512,6 +510,7 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "type": "string",
             "autocomplete": true,
             "autocompleteSort": [{"key": "timesaccessed", "operator": "-"}],
+            "columnRequired": true,
             "columnWidth": 180,
             "find": true,
             "sort": true
@@ -531,13 +530,12 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "columnRequired": true,
             "columnWidth": 180,
             "filter": true,
-            "find": true,
             "sort": true,
             "sortType": "person"
         },
         {
             "id": "country",
-            "title": "Production Country",
+            "title": "Country",
             "type": ["string"],
             "autocomplete": true,
             "columnWidth": 180,
@@ -579,16 +577,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "find": true,
             "sort": true
         },
-        {
-            "id": "setincountry",
-            "title": "Set in Country",
-            "type": ["string"],
-            "autocomplete": true,
-            "columnWidth": 180,
-            "filter": true,
-            "find": true,
-            "sort": true
-        },
         {
             "id": "style",
             "title": "Style",
@@ -782,6 +770,14 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "secondaryId": true,
             "sort": true
         },
+        {
+            "id": "icmaId",
+            "title": "Indiancine.ma ID",
+            "type": "string",
+            "columnWidth": 90,
+            "secondaryId": true,
+            "sort": true
+        },
         {
             "id": "comments",
             "title": "Comments",
@@ -1207,22 +1203,22 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
     the system (from).
     */
     "site": {
-        "description": "CineMuseSpace: A Cinematic Musée Imaginaire of Spatial Cultural Differences",
+        "description": "CineGenus research project",
         "email": {
             // E-mail address in contact form (to)
             "contact": "js2034@cam.ac.uk",
-            "footer": "-- \npandora.cinemusespace.com",
-            "prefix": "CineMuseSpace News -",
+            "footer": "-- \ncinegenus.cinemusespace.com",
+            "prefix": "CineGenus News -",
             // E-mail address uses by the system (from)
-            "system": "system@pandora.cinemusespace.com"
+            "system": "system@cinegenus.cinemusespace.com"
         },
         "https": false,
         "id": "cms",
-        "name": "CineMuseSpace",
+        "name": "CineGenus",
         // Set to true to allow search engines to index the site
         "public": false,
         "sendReferrer": true,
-        "url": "pandora.cinemusespace.com"
+        "url": "cinegenus.cinemusespace.com"
     },
     /*
     "sitePages" defines the sections of the main site dialog. If "news" is
@@ -1331,19 +1327,11 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             },
             "document": "",
             "documents": {},
-            "documentFiltersSize": 176,
             "documentSize": 256,
             "documentView": "view",
             "documentsSelection": {},
             "documentsSort": [{"key": "title", "operator": "+"}],
             "documentsView": "grid",
-            "documentFilters": [
-                {"id": "author", "sort": [{"key": "items", "operator": "-"}]},
-                {"id": "place", "sort": [{"key": "items", "operator": "-"}]},
-                {"id": "date", "sort": [{"key": "name", "operator": "-"}]},
-                {"id": "publisher", "sort": [{"key": "items", "operator": "-"}]},
-                {"id": "language", "sort": [{"key": "items", "operator": "-"}]}
-            ],
             "edit": "",
             "edits": {},
             "editSelection": [],
@@ -1408,7 +1396,6 @@ examples (config.SITENAME.jsonc) that are part of this pan.do/ra distribution.
             "showCalendarControls": false,
             "showClips": true,
             "showDocument": true,
-            "showDocumentFilters": false,
             "showFilters": true,
             "showIconBrowser": false,
             "showInfo": true,

ontology/update.py

@@ -39,22 +39,11 @@ def get_node(name, children, parent=None):
     return node
 
 
-def render_children(root, indent=0):
-    txt = ('\t' * indent) + root['name']
-    if 'children' in root:
-        parts = ''
-        for child in root['children']:
-            parts += '\n' + render_children(child, indent+1)
-        txt += '\n'.join([('\t' * indent) + p for p in parts.split('\n')])
-    return '\n'.join([l.rstrip() for l in txt.split('\n')])
-
 if __name__ == '__main__':
     os.chdir(base)
 
     tree = defaultdict(dict)
 
-    ontology_txt = ''
-
     for keyword in keywords:
         if ': ' not in keyword:
             parent = 'other'
@@ -86,10 +75,5 @@ if __name__ == '__main__':
         child = get_node(name, tree[name], name)
         sized_ontology['children'].append(child)
 
-
-    ontology_txt = render_children(sized_ontology)
-
     with open('../static/ontology/sized_ontology.json', 'w') as fd:
         json.dump(sized_ontology, fd, indent=4, sort_keys=True)
-    with open('../static/ontology/ontology.txt', 'w') as fd:
-        fd.write(ontology_txt)

static/js/infoView.cms.js

@@ -301,7 +301,7 @@ pandora.ui.infoView = function(data) {
 
     renderGroup(['originalTitle', 'alternativeTitles']);
 
-    renderGroup(['setincountry', 'type', 'framework', 'style', 'version']);
+    renderGroup(['type', 'framework', 'style', 'version']);
 
     renderGroup(['country', 'year', 'language', 'runtime', 'color', 'sound']);
 
@@ -314,7 +314,7 @@ pandora.ui.infoView = function(data) {
     renderGroup(['actor']);
     renderGroup(['filmingLocations']);
 
-    renderGroup(['imdbId', 'genre']);
+    renderGroup(['imdbId', 'icmaId', 'genre']);
 
     if (canEdit) {
         updateIMDb();
@@ -603,13 +603,9 @@ pandora.ui.infoView = function(data) {
         } else if (key == 'imdbId') {
             ret = '<a href="http://www.imdb.com/title/tt'
                 + value + '">' + value + '</a>';
-        } else if (key == 'encyclopedia') {
-            ret = '<a href="/texts/indiancine.ma:Encyclopedia%20of%20Indian%20Cinema/'
-                + (value == 'Summary' ? '240' : '570') + '">'
-                + value + '</a>';
-        } else if (key == 'wiki') {
-            ret = '<a href="' + value + '">'
-                + Ox.decodeURIComponent(value.split('wiki/').pop()) + '</a>';
+        } else if (key == 'icmaId') {
+            ret = '<a href="https://indiancine.ma/'
+                + value + '">' + value + '</a>';
         } else {
             ret = value;
         }

tasks.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-import os
 from datetime import datetime, timedelta
 import subprocess
 
@@ -9,16 +8,9 @@ from celery.task import periodic_task
 def subtitles_user(**kwargs):
     import annotation.models
     from user.models import User
-    try:
     u = User.objects.get(username='subtitles')
-    except User.DoesNotExist:
-        print('subtitles user does not exist, unable to move subtitles')
-        return
     annotation.models.Annotation.objects.filter(layer='subtitles').exclude(user=u).update(user=u)
 
-@periodic_task(run_every=timedelta(hours=1), queue='encoding')
-def update_ontology(**kwargs):
-    import annotation.models
     t = datetime.now() - annotation.models.Annotation.objects.all().order_by('-created')[0].created
     if t < timedelta(hours=1):
         try: