clickable links #35

Merged
pi-ux-ce merged 1 commits from testing into main 2026-09-04 14:59:41 +00:00
3 changed files with 38 additions and 14 deletions
+4 -12
View File
@@ -19,16 +19,6 @@ def check(modeladmin, request, queryset):
query.save(update_fields=["status","result"]) query.save(update_fields=["status","result"])
# modeladmin.message_user(
# request,
# ngettext(
# "%d episode was successfully marked as seen.",
# "%d episodes were successfully marked as seen.",
# updated,
# )
# % updated,
# messages.SUCCESS,
# )
@admin.action(description="cleaning the url") @admin.action(description="cleaning the url")
def urlcleaning(modeladmin, request, queryset): def urlcleaning(modeladmin, request, queryset):
@@ -72,7 +62,7 @@ class streamingAdmin(ImportExportModelAdmin):
@admin.register(StreamingRedirectData) @admin.register(StreamingRedirectData)
class StreamingRedirectAdmin(ImportExportModelAdmin): class StreamingRedirectAdmin(ImportExportModelAdmin):
list_display = ['name','season','episode','randomViewing','url_example','addedDate','alias'] list_display = ['name','season','episode','randomViewing','clickable_links','addedDate','alias']
#fields = ['name','season','episode','url_example','prefix','infix','suffix','alias','randomViewing','seasonInformation'] #fields = ['name','season','episode','url_example','prefix','infix','suffix','alias','randomViewing','seasonInformation']
fieldsets = ( fieldsets = (
( (
@@ -82,7 +72,7 @@ class StreamingRedirectAdmin(ImportExportModelAdmin):
( (
'url', { 'url', {
'fields': (('prefix','infix','suffix'),'url_example') 'fields': (('prefix','infix','suffix'))
}), }),
( (
'Information', { 'Information', {
@@ -90,3 +80,5 @@ class StreamingRedirectAdmin(ImportExportModelAdmin):
'fields': ('seasonInformation','alias','betaserieShowId','maximumNumberSeason') 'fields': ('seasonInformation','alias','betaserieShowId','maximumNumberSeason')
}), }),
) )
def clickable_links(self, obj):
return format_html('<a href="{}">{}</a>', obj.url_display,obj.url_display)
@@ -0,0 +1,22 @@
# Generated by Django 4.2.30 on 2026-09-04 14:29
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('streaming', '0013_streamingredirectdata_maximumnumberseason'),
]
operations = [
migrations.RemoveField(
model_name='streamingredirectdata',
name='url_example',
),
migrations.AddField(
model_name='streamingredirectdata',
name='url_display',
field=models.CharField(blank=True, help_text='https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=18&episode=5', max_length=1000, null=True),
),
]
+11 -1
View File
@@ -1,6 +1,7 @@
from django.db import models from django.db import models
from apps.betaserie.utils import betaserieUtils from apps.betaserie.utils import betaserieUtils
from django_code.core.settings import ENVIRONMENT
# Create your models here. # Create your models here.
@@ -20,7 +21,7 @@ class StreamingRedirectData(models.Model):
name = models.CharField(primary_key=True,max_length=1000, help_text="Name of the show") name = models.CharField(primary_key=True,max_length=1000, help_text="Name of the show")
season = models.IntegerField(null=False,default=1) season = models.IntegerField(null=False,default=1)
episode = models.IntegerField(null=False,default=0) episode = models.IntegerField(null=False,default=0)
url_example = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=18&episode=5") url_display = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=18&episode=5",blank=True, null=True)
prefix = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=",blank=True, null=True) prefix = models.CharField(max_length=1000, help_text="https://www.1shows.org/tv/456-the-simpsons?streaming=true&season=",blank=True, null=True)
infix = models.CharField(max_length=1000, help_text="&episode=",blank=True, null=True) infix = models.CharField(max_length=1000, help_text="&episode=",blank=True, null=True)
suffix = models.CharField(max_length=1000, help_text="" ,blank=True, null=True) suffix = models.CharField(max_length=1000, help_text="" ,blank=True, null=True)
@@ -52,6 +53,13 @@ class StreamingRedirectData(models.Model):
print(betaserie.identify_serie(serie_name)) print(betaserie.identify_serie(serie_name))
return betaserie.identify_serie(serie_name) return betaserie.identify_serie(serie_name)
def url_display_set(self,alias):
if ENVIRONMENT == "PRODUCTION":
url = "https://streaming.geeraert.eu/"
else:
url = "https://streaming-testing.geeraert.eu/"
return url+alias
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
@@ -63,6 +71,8 @@ class StreamingRedirectData(models.Model):
self.betaserieShowId = self.betaserie_show_id(self.name) self.betaserieShowId = self.betaserie_show_id(self.name)
if not self.maximumNumberSeason: if not self.maximumNumberSeason:
self.maximumNumberSeason = self.maximum_Number_Season(self.name) self.maximumNumberSeason = self.maximum_Number_Season(self.name)
if not self.url_display:
self.url_display = self.url_display_set(self.alias)
super().save(*args, **kwargs) super().save(*args, **kwargs)
class Meta: class Meta: