diff --git a/django_code/apps/streaming/admin.py b/django_code/apps/streaming/admin.py index 1b3bd20..c81595f 100644 --- a/django_code/apps/streaming/admin.py +++ b/django_code/apps/streaming/admin.py @@ -19,16 +19,6 @@ def check(modeladmin, request, queryset): 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") def urlcleaning(modeladmin, request, queryset): @@ -72,7 +62,7 @@ class streamingAdmin(ImportExportModelAdmin): @admin.register(StreamingRedirectData) 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'] fieldsets = ( ( @@ -82,11 +72,13 @@ class StreamingRedirectAdmin(ImportExportModelAdmin): ( 'url', { - 'fields': (('prefix','infix','suffix'),'url_example') + 'fields': (('prefix','infix','suffix')) }), ( 'Information', { "classes": ["collapse"], 'fields': ('seasonInformation','alias','betaserieShowId','maximumNumberSeason') }), - ) \ No newline at end of file + ) + def clickable_links(self, obj): + return format_html('{}', obj.url_display,obj.url_display) diff --git a/django_code/apps/streaming/migrations/0014_remove_streamingredirectdata_url_example_and_more.py b/django_code/apps/streaming/migrations/0014_remove_streamingredirectdata_url_example_and_more.py new file mode 100644 index 0000000..9962516 --- /dev/null +++ b/django_code/apps/streaming/migrations/0014_remove_streamingredirectdata_url_example_and_more.py @@ -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), + ), + ] diff --git a/django_code/apps/streaming/models.py b/django_code/apps/streaming/models.py index 6bef159..f4e0789 100644 --- a/django_code/apps/streaming/models.py +++ b/django_code/apps/streaming/models.py @@ -1,6 +1,7 @@ from django.db import models from apps.betaserie.utils import betaserieUtils +from django_code.core.settings import ENVIRONMENT # 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") season = models.IntegerField(null=False,default=1) 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) 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) @@ -52,6 +53,13 @@ class StreamingRedirectData(models.Model): print(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): @@ -63,6 +71,8 @@ class StreamingRedirectData(models.Model): self.betaserieShowId = self.betaserie_show_id(self.name) if not self.maximumNumberSeason: 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) class Meta: