Formateos

requirements.txt

@@ -7,6 +7,10 @@ django-tastypie
 django-admin-list-filter-dropdown
 wikipedia-api
 <<<<<<< HEAD
+<<<<<<< HEAD
 bs4
 =======
 >>>>>>> 2dabc4a (Adición de más estilos)
+=======
+bs4
+>>>>>>> 0632c76 (Formateos)

source/main/models.py

@@ -6,12 +6,15 @@ import random
 import time
 import wikipediaapi
 from bs4 import BeautifulSoup
+<<<<<<< HEAD
 =======
 >>>>>>> fb23014 (Inicio de diseño)
 =======
 import time
 import wikipediaapi
 >>>>>>> 2dabc4a (Adición de más estilos)
+=======
+>>>>>>> 0632c76 (Formateos)
 from django.conf import settings
 from django.db import models
 from pathlib import Path
@@ -281,7 +284,7 @@ class MovieQuerySet(models.QuerySet):
             "Mejor valorados": self.fix_all_data(self.top_random_pick("stars")),
             "Más descargados": self.fix_all_data(self.top_pick("count")),
         }
-        sections['genders'] = {}
+        sections["genders"] = {}
         return sections
 
 <<<<<<< HEAD
@@ -306,7 +309,7 @@ class MovieQuerySet(models.QuerySet):
         movie["file_name"] = self.fix_path(movie["file_name"])
         movie["cartel"] = self.fix_path(movie["cartel"])
         if wikipedia:
-            movie['wiki'] = self.get_wiki(movie)
+            movie["wiki"] = self.get_wiki(movie)
 
     def fix_path(self, el):
         if settings.DEBUG:
@@ -315,8 +318,11 @@ class MovieQuerySet(models.QuerySet):
             return settings.MEDIA_ROOT / el
 
     def fix_summ(self, raw):
-        # TODO: quitar .reference
-        return raw
+        html = BeautifulSoup(raw, "lxml")
+        for ref in html.find_all("sup", "reference"):
+            ref.decompose()
+        clean = list(map(lambda x: str(x), html.body.children))
+        return " ".join(clean)
 
     def format_stars(self, num):
         stars = "★" * num
@@ -332,17 +338,17 @@ class MovieQuerySet(models.QuerySet):
         return time.strftime("%H:%M", time.gmtime(secs))
 
     def get_wiki(self, movie, again=True):
-        wiki = self.get_wiki_page(movie['original_name'])
+        wiki = self.get_wiki_page(movie["original_name"])
         if not wiki:
-             wiki = self.get_wiki_page(movie['name'])
+            wiki = self.get_wiki_page(movie["name"])
         return wiki
-        
 
     def get_wiki_page(self, title):
         try:
-            lang = settings.LANGUAGE_CODE.split('-')[0]
-            wiki = wikipediaapi.Wikipedia(lang, 
-                extract_format=wikipediaapi.ExtractFormat.HTML)
+            lang = settings.LANGUAGE_CODE.split("-")[0]
+            wiki = wikipediaapi.Wikipedia(
+                lang, extract_format=wikipediaapi.ExtractFormat.HTML
+            )
             page = wiki.page(title)
             if page.exists():
                 return {
@@ -352,7 +358,7 @@ class MovieQuerySet(models.QuerySet):
                 }
             else:
                 return None
-        except NameError:
+        except:
             return None
 
     def get_movie(self, id):
@@ -363,7 +369,6 @@ class MovieQuerySet(models.QuerySet):
 >>>>>>> 098cb26 (Adición de ficha por peli)
 
 
-
 def upload_cartel(instance, filename):
     first = filename[0].upper()
     if first.isdigit():

source/main/views.py

@@ -19,6 +19,9 @@ def search(request):
 
 
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 0632c76 (Formateos)
 def about(request):
     context = {}
     return render(request, "about.html", context)
@@ -37,6 +40,7 @@ def movie(request, id):
 def movies(request, key):
     context = {"sections": {"Llave": "Valor"}}
     return render(request, "movies.html", context)
+<<<<<<< HEAD
 =======
     context = {'sections': Movie.objects.home_pick()}
     return render(request, 'home.html', context)
@@ -59,3 +63,5 @@ def movie(request, id):
     context = {"movie": Movie.objects.get_movie(id)}
     return render(request, "movie.html", context)
 >>>>>>> 098cb26 (Adición de ficha por peli)
+=======
+>>>>>>> 0632c76 (Formateos)

source/mauflix/urls.py

@@ -38,7 +38,9 @@ urlpatterns = [
 =======
     path("", views.home, name="home"),
     path("search/", views.search, name="search"),
-    # path('movies/<str:args>', views.movies, name='movies'),
+    path("about/", views.about, name="about"),
+    path("bugs/", views.bugs, name="bugs"),
+    path("movies/<str:key>", views.movies, name="movies"),
     path("movie/<int:id>", views.movie, name="movie"),
     path("ultimas/rss/", LatestMoviesFeed()),
     path("admin/", admin.site.urls),

source/templates/info.html

@@ -4,6 +4,7 @@
   {% include 'info-head.html' with movie=movie %}
   {% include 'info-body.html' with movie=movie %}
   {% include 'info-foot.html' with movie=movie %}
+<<<<<<< HEAD
 </section>
 =======
 <section class="hero {% if request.get_full_path == "/" %}is-fullheight{% else %}is-large{% endif%}">
@@ -96,6 +97,8 @@
       </div>
     </nav>
   </div>
+=======
+>>>>>>> 0632c76 (Formateos)
 </section>
 <<<<<<< HEAD
 {% if request.get_full_path != "/" %}

source/templates/nav.html

@@ -12,6 +12,7 @@
   </div>
   <div id="menu" class="navbar-menu force-display">
     <div class="navbar-start">
+<<<<<<< HEAD
 <<<<<<< HEAD
       {% if request.get_full_path != "/" %}
         <a class="navbar-item" href="{% url 'home' %}">Inicio</a>
@@ -22,12 +23,19 @@
       {% if request.get_full_path == "/" %}
         <a class="navbar-item" href="{% url 'search' %}">Buscar</a>
       {% else %}
+=======
+      {% if request.get_full_path != "/" %}
+>>>>>>> 0632c76 (Formateos)
         <a class="navbar-item" href="{% url 'home' %}">Inicio</a>
 >>>>>>> 098cb26 (Adición de ficha por peli)
       {% endif %}
+      {% if request.get_full_path != "/search/" %}
+        <a class="navbar-item" href="{% url 'search' %}">Buscar</a>
+      {% endif %}
       <div class="navbar-item has-dropdown is-hoverable">
         <a class="navbar-link">Más</a>
         <div class="navbar-dropdown">
+<<<<<<< HEAD
 <<<<<<< HEAD
           <a class="navbar-item" href="{% url 'about' %}" >Acerca</a>
           <hr class="navbar-divider">
@@ -37,17 +45,26 @@
           <hr class="navbar-divider">
           <a class="navbar-item">Reporta un problema</a>
 >>>>>>> 098cb26 (Adición de ficha por peli)
+=======
+          <a class="navbar-item" href="{% url 'about' %}" >Acerca</a>
+          <hr class="navbar-divider">
+          <a class="navbar-item" href="{% url 'bugs' %}">Reporta un problema</a>
+>>>>>>> 0632c76 (Formateos)
         </div>
       </div>
     </div>
     <div class="navbar-end">
       <div class="navbar-item">
         <div class="buttons">
+<<<<<<< HEAD
 <<<<<<< HEAD
           <a class="button is-primary" href="{% url 'admin:index' %}">Ingresa</a>
 =======
           <a class="button is-primary">Ingresa</a>
 >>>>>>> 098cb26 (Adición de ficha por peli)
+=======
+          <a class="button is-primary" href="{% url 'admin:index' %}">Ingresa</a>
+>>>>>>> 0632c76 (Formateos)
         </div>
       </div>
     </div>