Commit 7a57b70a authored by Dmitry Shelepnev's avatar Dmitry Shelepnev
Browse files

Updates for django 2.0 Compatibility

parent 7d05c6bd

.travis.yml

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ env: 
    - DJANGO='django>=2.0'



install:

    - travis_retry pip install -r requirements.txt

    - travis_retry pip install $DJANGO

    - travis_retry pip install -r requirements.txt



script:

    - python manage.py test

opds_catalog/dl.py

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ def Download(request, book_id, zip_flag): 
    """ Загрузка файла книги """

    book = Book.objects.get(id=book_id)



    if config.SOPDS_AUTH and request.user.is_authenticated():

    if config.SOPDS_AUTH and request.user.is_authenticated:

        bookshelf.objects.get_or_create(user=request.user, book=book)



    full_path=os.path.join(config.SOPDS_ROOT_LIB,book.path)
@@ -216,7 +216,7 @@ def ConvertFB2(request, book_id, convert_type): 
    if book.format!='fb2':

        raise Http404



    if config.SOPDS_AUTH and request.user.is_authenticated():

    if config.SOPDS_AUTH and request.user.is_authenticated:

        bookshelf.objects.get_or_create(user=request.user, book=book)



    full_path=os.path.join(config.SOPDS_ROOT_LIB,book.path)

opds_catalog/feeds.py

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class AuthFeed(Feed): 
    def __call__(self,request,*args,**kwargs):

        self.request = request

        if config.SOPDS_AUTH:

            if request.user.is_authenticated():

            if request.user.is_authenticated:

                return super().__call__(request,*args,**kwargs)

        

        bau = BasicAuthMiddleware()
@@ -173,7 +173,7 @@ class MainFeed(AuthFeed): 
                    {"id":5, "title":_("By series"), "link":("opds_catalog:lang_series" if config.SOPDS_ALPHABET_MENU else "opds_catalog:nolang_series"),

                     "descr": _("Series: %(series)s."),"counters":{"series":Counter.objects.get_counter(models.counter_allseries)}},

        ]

        if config.SOPDS_AUTH and self.request.user.is_authenticated():

        if config.SOPDS_AUTH and self.request.user.is_authenticated:

            mainitems += [

                        {"id":6, "title":_("%(username)s Book shelf")%({"username":self.request.user.username}), "link":"opds_catalog:bookshelf",

                         "descr":_("%(username)s books readed: %(bookshelf)s."),"counters":{"bookshelf":bookshelf.objects.filter(user=self.request.user).count(),"username":self.request.user.username}},

opds_catalog/middleware.py

+3 −2
Original line number Diff line number Diff line 
import base64

from django.utils.deprecation import MiddlewareMixin



from django.http import HttpResponse

from django.contrib import auth
@@ -49,7 +50,7 @@ class BasicAuthMiddleware(object): 


        return self.unauthed()



class SOPDSLocaleMiddleware:

class SOPDSLocaleMiddleware(MiddlewareMixin):



    def process_request(self, request):

            request.LANG = config.SOPDS_LANGUAGE
@@ -59,7 +60,7 @@ class SOPDSLocaleMiddleware: 
class FetchFromCacheMiddleware(DjangoFetchFromCacheMiddleware):



    def process_request(self, request):

        if not request.user.is_authenticated():

        if not request.user.is_authenticated:

            return None

        else:

            return super(FetchFromCacheMiddleware, self).process_request(request)
 
 No newline at end of file

sopds/settings.py

+2 −2
Original line number Diff line number Diff line
@@ -44,14 +44,14 @@ INSTALLED_APPS = [ 
    'constance',

]



MIDDLEWARE_CLASSES = [

MIDDLEWARE = [

    'django.middleware.cache.UpdateCacheMiddleware',

    'django.middleware.security.SecurityMiddleware',

    'django.contrib.sessions.middleware.SessionMiddleware',

    'django.middleware.common.CommonMiddleware',

    'django.middleware.csrf.CsrfViewMiddleware',

    'django.contrib.auth.middleware.AuthenticationMiddleware',    

    'django.contrib.auth.middleware.SessionAuthenticationMiddleware',   

    #'django.contrib.auth.middleware.SessionAuthenticationMiddleware',

    'opds_catalog.middleware.SOPDSLocaleMiddleware',

    'django.contrib.messages.middleware.MessageMiddleware',

    'django.middleware.clickjacking.XFrameOptionsMiddleware',