diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..d55cd2a --- /dev/null +++ b/.editorconfig @@ -0,0 +1,11 @@ +[*] +end_of_line = lf +insert_final_newline = true + +[*.{js,py,html}] +indent_style = space +indent_size = 4 +charset = utf-8 + +[Makefile] +indent_style = tab diff --git a/oxdata/cover/admin.py b/oxdata/cover/admin.py index 5579815..7a8c272 100644 --- a/oxdata/cover/admin.py +++ b/oxdata/cover/admin.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from django.contrib import admin diff --git a/oxdata/cover/models.py b/oxdata/cover/models.py index 8cec1ee..476b3d3 100644 --- a/oxdata/cover/models.py +++ b/oxdata/cover/models.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import os.path diff --git a/oxdata/cover/views.py b/oxdata/cover/views.py index 1233d5b..15663d7 100644 --- a/oxdata/cover/views.py +++ b/oxdata/cover/views.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from oxdjango.shortcuts import render_to_json_response diff --git a/oxdata/lookup/admin.py b/oxdata/lookup/admin.py index 4231c95..d1aded6 100644 --- a/oxdata/lookup/admin.py +++ b/oxdata/lookup/admin.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from django.contrib import admin diff --git a/oxdata/lookup/cache.py b/oxdata/lookup/cache.py index becc6e0..4534e19 100644 --- a/oxdata/lookup/cache.py +++ b/oxdata/lookup/cache.py @@ -1,5 +1,4 @@ # -*- coding: UTF-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import ox.web.criterion diff --git a/oxdata/lookup/management/commands/cache_ids.py b/oxdata/lookup/management/commands/cache_ids.py index d0516ad..8d9337d 100644 --- a/oxdata/lookup/management/commands/cache_ids.py +++ b/oxdata/lookup/management/commands/cache_ids.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from django.core.management.base import BaseCommand, CommandError from django.conf import settings diff --git a/oxdata/lookup/models.py b/oxdata/lookup/models.py index a980c3b..c2a8a6f 100644 --- a/oxdata/lookup/models.py +++ b/oxdata/lookup/models.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import os diff --git a/oxdata/lookup/modules.py b/oxdata/lookup/modules.py index c334029..72659b1 100644 --- a/oxdata/lookup/modules.py +++ b/oxdata/lookup/modules.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import class IdModules(object): diff --git a/oxdata/lookup/tasks.py b/oxdata/lookup/tasks.py index f441086..7676fde 100644 --- a/oxdata/lookup/tasks.py +++ b/oxdata/lookup/tasks.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from datetime import timedelta, datetime diff --git a/oxdata/lookup/views.py b/oxdata/lookup/views.py index 1fe1f18..fd1715d 100644 --- a/oxdata/lookup/views.py +++ b/oxdata/lookup/views.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from oxdjango.shortcuts import render_to_json_response, json_response diff --git a/oxdata/movie/management/commands/cache_imdb_ids.py b/oxdata/movie/management/commands/cache_imdb_ids.py index 8b73068..f96a73e 100644 --- a/oxdata/movie/management/commands/cache_imdb_ids.py +++ b/oxdata/movie/management/commands/cache_imdb_ids.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from django.core.management.base import BaseCommand diff --git a/oxdata/movie/management/commands/load_imdb_patches.py b/oxdata/movie/management/commands/load_imdb_patches.py index 970f0f4..4377eb1 100644 --- a/oxdata/movie/management/commands/load_imdb_patches.py +++ b/oxdata/movie/management/commands/load_imdb_patches.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 import json from optparse import make_option diff --git a/oxdata/movie/models.py b/oxdata/movie/models.py index 3c95cbe..ffcd7ab 100644 --- a/oxdata/movie/models.py +++ b/oxdata/movie/models.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import re @@ -101,7 +100,7 @@ class Imdb(models.Model): episodeYear = models.CharField(max_length=4, blank=True, default='') episodeDirector = models.CharField(max_length=1000, blank=True, default='') seriesTitle = models.CharField(max_length=1000, blank=True, default='') - + invalid = models.BooleanField(default=False) patch = DictField(default=None, blank=True, null=True) diff --git a/oxdata/movie/views.py b/oxdata/movie/views.py index 4bbbc52..171517a 100644 --- a/oxdata/movie/views.py +++ b/oxdata/movie/views.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import diff --git a/oxdata/oxdjango/api/actions.py b/oxdata/oxdjango/api/actions.py index 584f96b..ba47f90 100644 --- a/oxdata/oxdjango/api/actions.py +++ b/oxdata/oxdjango/api/actions.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, absolute_import import inspect diff --git a/oxdata/oxdjango/api/urls.py b/oxdata/oxdjango/api/urls.py index 19eb11a..159c4ff 100644 --- a/oxdata/oxdjango/api/urls.py +++ b/oxdata/oxdjango/api/urls.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import absolute_import from django.conf.urls import url diff --git a/oxdata/oxdjango/api/views.py b/oxdata/oxdjango/api/views.py index 31c7123..b7249ab 100644 --- a/oxdata/oxdjango/api/views.py +++ b/oxdata/oxdjango/api/views.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, absolute_import import json diff --git a/oxdata/oxdjango/decorators.py b/oxdata/oxdjango/decorators.py index 55928fb..22da33e 100644 --- a/oxdata/oxdjango/decorators.py +++ b/oxdata/oxdjango/decorators.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import absolute_import try: diff --git a/oxdata/oxdjango/fields.py b/oxdata/oxdjango/fields.py index 275b068..24fefad 100644 --- a/oxdata/oxdjango/fields.py +++ b/oxdata/oxdjango/fields.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 import time import datetime import copy diff --git a/oxdata/oxdjango/http.py b/oxdata/oxdjango/http.py index d687ce0..51df1fd 100644 --- a/oxdata/oxdjango/http.py +++ b/oxdata/oxdjango/http.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 import os import mimetypes from datetime import datetime, timedelta diff --git a/oxdata/oxdjango/middleware.py b/oxdata/oxdjango/middleware.py index 0eccf47..4883f23 100644 --- a/oxdata/oxdjango/middleware.py +++ b/oxdata/oxdjango/middleware.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from .shortcuts import HttpErrorJson, render_to_json_response diff --git a/oxdata/oxdjango/query.py b/oxdata/oxdjango/query.py index 5a7e43d..4650071 100644 --- a/oxdata/oxdjango/query.py +++ b/oxdata/oxdjango/query.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from django.db.models.sql import Query from django.db.models.sql.compiler import SQLCompiler diff --git a/oxdata/oxdjango/shortcuts.py b/oxdata/oxdjango/shortcuts.py index b0f70be..0602b74 100644 --- a/oxdata/oxdjango/shortcuts.py +++ b/oxdata/oxdjango/shortcuts.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import print_function import datetime from django.utils import datetime_safe diff --git a/oxdata/oxdjango/utils.py b/oxdata/oxdjango/utils.py index 60eb896..0e5d553 100644 --- a/oxdata/oxdjango/utils.py +++ b/oxdata/oxdjango/utils.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from django.http import HttpResponse,Http404 from django.core.servers.basehttp import FileWrapper from django.conf import settings diff --git a/oxdata/poster/admin.py b/oxdata/poster/admin.py index 0f47a77..045e772 100644 --- a/oxdata/poster/admin.py +++ b/oxdata/poster/admin.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from django.contrib import admin diff --git a/oxdata/poster/management/commands/cache_poster.py b/oxdata/poster/management/commands/cache_poster.py index c150a09..1fd19d9 100644 --- a/oxdata/poster/management/commands/cache_poster.py +++ b/oxdata/poster/management/commands/cache_poster.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from django.core.management.base import BaseCommand, CommandError from django.conf import settings diff --git a/oxdata/poster/models.py b/oxdata/poster/models.py index fe9b500..d543c7e 100644 --- a/oxdata/poster/models.py +++ b/oxdata/poster/models.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import hashlib @@ -19,6 +18,7 @@ import ox.web.piratecinema from lookup.models import MovieId + def getPosters(movie_id, url_prefix='', limit=lambda x, y: 0.3 < x/y < 1): if not movie_id: return {} @@ -174,3 +174,13 @@ def get_poster_urls(m): addPoster(data['poster'], 'apple.com', m.imdb_id) ''' #fixme: get 0xdb still, possibly imdb still as fallback? + + +def cache_all_posters(): + for p in PosterCache.objects.all().filter(failed=False, image='').order_by('-id'): + poster = p.get() + if poster and (not poster.width or not poster.height): + p.failed = True + p.status = "invalid image" + p.image.delete() + p.save() diff --git a/oxdata/poster/tasks.py b/oxdata/poster/tasks.py index 1a88d04..e3af215 100644 --- a/oxdata/poster/tasks.py +++ b/oxdata/poster/tasks.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from datetime import timedelta diff --git a/oxdata/poster/views.py b/oxdata/poster/views.py index 6a80a8e..aa6762e 100644 --- a/oxdata/poster/views.py +++ b/oxdata/poster/views.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import from oxdjango.shortcuts import render_to_json_response diff --git a/oxdata/settings.py b/oxdata/settings.py index 52d0010..ab0246f 100644 --- a/oxdata/settings.py +++ b/oxdata/settings.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 # Django settings for oxdata project. import os from os.path import join, normpath, dirname diff --git a/oxdata/urls.py b/oxdata/urls.py index 83c30ee..b929165 100644 --- a/oxdata/urls.py +++ b/oxdata/urls.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 import os from django.conf.urls import url, include diff --git a/oxdata/views.py b/oxdata/views.py index c5f9327..c59c23c 100644 --- a/oxdata/views.py +++ b/oxdata/views.py @@ -1,5 +1,4 @@ # -*- coding: utf-8 -*- -# vi:si:et:sw=4:sts=4:ts=4 from django.shortcuts import render def index(request):