diff --git a/.editorconfig b/.editorconfig deleted file mode 100644 index d55cd2a..0000000 --- a/.editorconfig +++ /dev/null @@ -1,11 +0,0 @@ -[*] -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 7a8c272..5579815 100644 --- a/oxdata/cover/admin.py +++ b/oxdata/cover/admin.py @@ -1,4 +1,5 @@ # -*- 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 476b3d3..8cec1ee 100644 --- a/oxdata/cover/models.py +++ b/oxdata/cover/models.py @@ -1,4 +1,5 @@ # -*- 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 15663d7..1233d5b 100644 --- a/oxdata/cover/views.py +++ b/oxdata/cover/views.py @@ -1,4 +1,5 @@ # -*- 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 d1aded6..4231c95 100644 --- a/oxdata/lookup/admin.py +++ b/oxdata/lookup/admin.py @@ -1,4 +1,5 @@ # -*- 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 4534e19..becc6e0 100644 --- a/oxdata/lookup/cache.py +++ b/oxdata/lookup/cache.py @@ -1,4 +1,5 @@ # -*- 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 8d9337d..d0516ad 100644 --- a/oxdata/lookup/management/commands/cache_ids.py +++ b/oxdata/lookup/management/commands/cache_ids.py @@ -1,4 +1,5 @@ # -*- 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 c2a8a6f..a980c3b 100644 --- a/oxdata/lookup/models.py +++ b/oxdata/lookup/models.py @@ -1,4 +1,5 @@ # -*- 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 72659b1..c334029 100644 --- a/oxdata/lookup/modules.py +++ b/oxdata/lookup/modules.py @@ -1,4 +1,5 @@ # -*- 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 7676fde..f441086 100644 --- a/oxdata/lookup/tasks.py +++ b/oxdata/lookup/tasks.py @@ -1,4 +1,5 @@ # -*- 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 fd1715d..1fe1f18 100644 --- a/oxdata/lookup/views.py +++ b/oxdata/lookup/views.py @@ -1,4 +1,5 @@ # -*- 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 f96a73e..8b73068 100644 --- a/oxdata/movie/management/commands/cache_imdb_ids.py +++ b/oxdata/movie/management/commands/cache_imdb_ids.py @@ -1,4 +1,5 @@ # -*- 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 4377eb1..970f0f4 100644 --- a/oxdata/movie/management/commands/load_imdb_patches.py +++ b/oxdata/movie/management/commands/load_imdb_patches.py @@ -1,4 +1,5 @@ # -*- 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 ffcd7ab..3c95cbe 100644 --- a/oxdata/movie/models.py +++ b/oxdata/movie/models.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import re @@ -100,7 +101,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 171517a..4bbbc52 100644 --- a/oxdata/movie/views.py +++ b/oxdata/movie/views.py @@ -1,4 +1,5 @@ # -*- 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 ba47f90..584f96b 100644 --- a/oxdata/oxdjango/api/actions.py +++ b/oxdata/oxdjango/api/actions.py @@ -1,4 +1,5 @@ # -*- 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 159c4ff..19eb11a 100644 --- a/oxdata/oxdjango/api/urls.py +++ b/oxdata/oxdjango/api/urls.py @@ -1,4 +1,5 @@ # -*- 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 b7249ab..31c7123 100644 --- a/oxdata/oxdjango/api/views.py +++ b/oxdata/oxdjango/api/views.py @@ -1,4 +1,5 @@ # -*- 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 22da33e..55928fb 100644 --- a/oxdata/oxdjango/decorators.py +++ b/oxdata/oxdjango/decorators.py @@ -1,4 +1,5 @@ # -*- 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 24fefad..275b068 100644 --- a/oxdata/oxdjango/fields.py +++ b/oxdata/oxdjango/fields.py @@ -1,4 +1,5 @@ # -*- 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 51df1fd..d687ce0 100644 --- a/oxdata/oxdjango/http.py +++ b/oxdata/oxdjango/http.py @@ -1,4 +1,5 @@ # -*- 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 4883f23..0eccf47 100644 --- a/oxdata/oxdjango/middleware.py +++ b/oxdata/oxdjango/middleware.py @@ -1,4 +1,5 @@ # -*- 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 4650071..5a7e43d 100644 --- a/oxdata/oxdjango/query.py +++ b/oxdata/oxdjango/query.py @@ -1,4 +1,5 @@ # -*- 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 0602b74..b0f70be 100644 --- a/oxdata/oxdjango/shortcuts.py +++ b/oxdata/oxdjango/shortcuts.py @@ -1,4 +1,5 @@ # -*- 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 0e5d553..60eb896 100644 --- a/oxdata/oxdjango/utils.py +++ b/oxdata/oxdjango/utils.py @@ -1,4 +1,5 @@ # -*- 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 045e772..0f47a77 100644 --- a/oxdata/poster/admin.py +++ b/oxdata/poster/admin.py @@ -1,4 +1,5 @@ # -*- 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 1fd19d9..c150a09 100644 --- a/oxdata/poster/management/commands/cache_poster.py +++ b/oxdata/poster/management/commands/cache_poster.py @@ -1,4 +1,5 @@ # -*- 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 d543c7e..fe9b500 100644 --- a/oxdata/poster/models.py +++ b/oxdata/poster/models.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 from __future__ import division, print_function, absolute_import import hashlib @@ -18,7 +19,6 @@ 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,13 +174,3 @@ 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 e3af215..1a88d04 100644 --- a/oxdata/poster/tasks.py +++ b/oxdata/poster/tasks.py @@ -1,4 +1,5 @@ # -*- 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 aa6762e..6a80a8e 100644 --- a/oxdata/poster/views.py +++ b/oxdata/poster/views.py @@ -1,4 +1,5 @@ # -*- 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 ab0246f..52d0010 100644 --- a/oxdata/settings.py +++ b/oxdata/settings.py @@ -1,4 +1,5 @@ # -*- 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 b929165..83c30ee 100644 --- a/oxdata/urls.py +++ b/oxdata/urls.py @@ -1,4 +1,5 @@ # -*- 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 c59c23c..c5f9327 100644 --- a/oxdata/views.py +++ b/oxdata/views.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +# vi:si:et:sw=4:sts=4:ts=4 from django.shortcuts import render def index(request):