elmau/mauflix
elmau
/
mauflix
2
1
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

Aplicación de 'black'

This commit is contained in:
perro tuerto 2022-11-08 18:59:05 -08:00
parent d22e6ecda1
commit 0d0c2e156b
6 changed files with 69 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/main/admin.py
View File

@ -87,8 +87,12 @@ class AdminMovie(admin.ModelAdmin):
try:
server = Mastodon(
<<<<<<< HEAD
access_token=settings.TOKEN_MASTODON,
api_base_url=settings.URL_MASTODON,
=======
access_token=settings.TOKEN_MASTODON, api_base_url=settings.URL_MASTODON
>>>>>>> a468c37 (Aplicación de 'black')
)
media = server.media_post(cartel.read(), media_type)
@ -100,11 +104,15 @@ class AdminMovie(admin.ModelAdmin):
def _public_telegram(self, message, cartel):
url = f"https://api.telegram.org/bot{settings.TOKEN_TELEGRAM}/sendPhoto"
url_cartel = settings.URL_CDN.format(cartel)
<<<<<<< HEAD
data = {
"chat_id": settings.CHAT_ID,
"photo": url_cartel,
"caption": message,
}
=======
data = {"chat_id": settings.CHAT_ID, "photo": url_cartel, "caption": message}
>>>>>>> a468c37 (Aplicación de 'black')
result = httpx.post(url, data=data).json()
return

4
source/main/feeds.py
View File

@ -17,7 +17,9 @@ class LatestMoviesFeed(Feed):
return item.name
def item_description(self, item):
message = f"{item.name}, Dirigida por: {item.directors.all()[0]}, Año: {item.year}"
message = (
f"{item.name}, Dirigida por: {item.directors.all()[0]}, Año: {item.year}"
)
return message
def item_link(self, item):

24
source/main/migrations/0001_initial.py
View File

@ -65,6 +65,7 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
<<<<<<< HEAD
(
"name",
models.CharField(max_length=500, verbose_name="Nombre"),
@ -75,6 +76,13 @@ class Migration(migrations.Migration):
blank=True,
null=True,
verbose_name="Fecha de nacimiento",
=======
("name", models.CharField(max_length=500, verbose_name="Nombre")),
(
"date_born",
models.DateField(
blank=True, null=True, verbose_name="Fecha de nacimiento"
>>>>>>> a468c37 (Aplicación de 'black')
),
),
(
@ -83,9 +91,13 @@ class Migration(migrations.Migration):
),
(
"is_director",
<<<<<<< HEAD
models.BooleanField(
default=False, verbose_name="Es Director"
),
=======
models.BooleanField(default=False, verbose_name="Es Director"),
>>>>>>> a468c37 (Aplicación de 'black')
),
(
"photo",
@ -124,10 +136,14 @@ class Migration(migrations.Migration):
verbose_name="ID",
),
),
<<<<<<< HEAD
(
"name",
models.CharField(max_length=1000, verbose_name="Nombre"),
),
=======
("name", models.CharField(max_length=1000, verbose_name="Nombre")),
>>>>>>> a468c37 (Aplicación de 'black')
(
"original_name",
models.CharField(
@ -148,9 +164,13 @@ class Migration(migrations.Migration):
),
(
"year",
<<<<<<< HEAD
models.PositiveSmallIntegerField(
default=1900, verbose_name="Año"
),
=======
models.PositiveSmallIntegerField(default=1900, verbose_name="Año"),
>>>>>>> a468c37 (Aplicación de 'black')
),
(
"duration",
@ -169,9 +189,13 @@ class Migration(migrations.Migration):
),
(
"count",
<<<<<<< HEAD
models.PositiveIntegerField(
default=0, verbose_name="Descargas"
),
=======
models.PositiveIntegerField(default=0, verbose_name="Descargas"),
>>>>>>> a468c37 (Aplicación de 'black')
),
(
"stars",

23
source/main/models.py
View File

@ -120,20 +120,25 @@ class MovieQuerySet(models.QuerySet):
url = "../../"
return url + img.url
def random_pick (self, random_max = 5, **kwargs):
def random_pick(self, random_max=5, **kwargs):
all = list(Movie.objects.filter(**kwargs).values())
if len(all) > random_max:
return random.sample(all, random_max)
else:
return all
def top_pick (self, key, top_max = 5):
all = list(Movie.objects.order_by(f'-{key}').values())
def top_pick(self, key, top_max=5):
all = list(Movie.objects.order_by(f"-{key}").values())
return all[:top_max]
<<<<<<< HEAD
def top_random_pick(self, key, top_max = 5):
all = list(Movie.objects.order_by(f'-{key}').values())
>>>>>>> fb23014 (Inicio de diseño)
=======
def top_random_pick(self, key, top_max=5):
all = list(Movie.objects.order_by(f"-{key}").values())
>>>>>>> a468c37 (Aplicación de 'black')
top = []
for movie in all:
if movie[key] == all[0][key]:
@ -237,16 +242,16 @@ class MovieQuerySet(models.QuerySet):
=======
def home_pick(self):
genders = list(Gender.objects.values_list('id', flat = True))
genders = list(Gender.objects.values_list("id", flat=True))
sections = {
'Novedades': self.top_pick('id'),
'Mejor valorados': self.top_random_pick('stars'),
'Más descargados': self.top_pick('count'),
'genders': {},
"Novedades": self.top_pick("id"),
"Mejor valorados": self.top_random_pick("stars"),
"Más descargados": self.top_pick("count"),
"genders": {},
}
for gender in genders:
key = Gender.objects.get(pk=gender).name
sections['genders'][key] = self.random_pick(genders=gender)
sections["genders"][key] = self.random_pick(genders=gender)
return sections
def get_directors(self):

12
source/main/views.py
View File

@ -7,6 +7,7 @@ from .models import Movie, Person
def home(request):
<<<<<<< HEAD
<<<<<<< HEAD
context = {"sections": Movie.objects.home_pick()}
return render(request, "home.html", context)
@ -38,8 +39,17 @@ def movies(request, key):
=======
context = {'sections': Movie.objects.home_pick()}
return render(request, 'home.html', context)
=======
context = {"sections": Movie.objects.home_pick()}
return render(request, "home.html", context)
>>>>>>> a468c37 (Aplicación de 'black')
def search (request):
def search(request):
context = {}
<<<<<<< HEAD
return render(request, 'search.html', context)
>>>>>>> fb23014 (Inicio de diseño)
=======
return render(request, "search.html", context)
>>>>>>> a468c37 (Aplicación de 'black')

9
source/mauflix/urls.py
View File

@ -16,6 +16,7 @@ v1_api.register(ResourceMovies())
urlpatterns = [
<<<<<<< HEAD
<<<<<<< HEAD
path("", views.home, name="home"),
path("search/", views.search, name="search"),
@ -34,4 +35,12 @@ urlpatterns = [
path('admin/', admin.site.urls),
#path('api/', include(v1_api.urls)),
>>>>>>> fb23014 (Inicio de diseño)
=======
path("", views.home, name="home"),
path("search/", views.search, name="search"),
# path('movies/<str:args>', views.movies, name='movies'),
path("ultimas/rss/", LatestMoviesFeed()),
path("admin/", admin.site.urls),
# path('api/', include(v1_api.urls)),
>>>>>>> a468c37 (Aplicación de 'black')
] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)