From 23134aa0df50310fccd5bf9248fb6cb4ed1f8c3c Mon Sep 17 00:00:00 2001 From: Danny Martinez Date: Fri, 12 Jun 2020 15:43:36 -0400 Subject: [PATCH] fixed syntax issues in models --- keymedia/__pycache__/settings.cpython-37.pyc | Bin 2349 -> 2357 bytes keymedia/settings.py | 2 +- managemedia/models/.__init__.py.swp | Bin 1024 -> 0 bytes managemedia/models/books.py | 10 ++++----- managemedia/models/common.py | 21 ++++++++++--------- managemedia/models/movies.py | 7 ++++--- managemedia/models/tv.py | 12 +++++------ managemedia/models/vgames.py | 14 ++++++------- 8 files changed, 34 insertions(+), 32 deletions(-) delete mode 100644 managemedia/models/.__init__.py.swp diff --git a/keymedia/__pycache__/settings.cpython-37.pyc b/keymedia/__pycache__/settings.cpython-37.pyc index c644ff7d725f7ec278aae399d60ea99c307d049d..3e5e6aebdfcbe01f401873ccdfe2060dc62f10cd 100644 GIT binary patch delta 57 zcmZ20v{i`LiIpr9BX2U3s8nuZUSfJ`ZfZ(qqF!P_L9w1=LBZx;rWI@e DbCwV# diff --git a/keymedia/settings.py b/keymedia/settings.py index 2ef42a5..9ad89c5 100644 --- a/keymedia/settings.py +++ b/keymedia/settings.py @@ -31,7 +31,7 @@ ALLOWED_HOSTS = [] # Application definition INSTALLED_APPS = [ - 'managemedia.apps.AppConfig', + 'managemedia.apps.ManagemediaConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/managemedia/models/.__init__.py.swp b/managemedia/models/.__init__.py.swp deleted file mode 100644 index 466cd7e6d514136f58a00d686cb12846b6fea87f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1024 zcmYc?$V<%2S1{HyVn6}Um>C#~^7Bhj1aWXOvorHjaw;=%NW+EW<1_OzOXB183M%1Z Oqm0oI7!84e3jqM-q76d; diff --git a/managemedia/models/books.py b/managemedia/models/books.py index 6a6fd3d..69fa98e 100644 --- a/managemedia/models/books.py +++ b/managemedia/models/books.py @@ -1,16 +1,16 @@ from django.db import models from .common import CommonMediaFields class Book(CommonMediaFields): - author = models.ForeignKey('Author') - series = models.ForeignKey('Series', blank=True) + author = models.ForeignKey('Author', on_delete=models.CASCADE) + series = models.ForeignKey('Series', on_delete=models.CASCADE, blank=True) series_entry = models.BooleanField('Series Entry', blank=True) is_comic = models.BooleanField('Comic') is_manga = models.BooleanField('Manga') class Author(models.Model): - name = models.CharFields('Author', unique=True) - sort_name = models.CharFields('Author sort name', blank=True) + name = models.CharField('Author', unique=True) + sort_name = models.CharField('Author sort name', blank=True) class Series(models.Model): - name = models.CharFields('Series', unique=True) + name = models.CharField('Series', unique=True) total_entries = models.PositiveIntegerField('Total Entries', blank=True) diff --git a/managemedia/models/common.py b/managemedia/models/common.py index de4e54b..6f23a31 100644 --- a/managemedia/models/common.py +++ b/managemedia/models/common.py @@ -1,4 +1,5 @@ from django.db import models +from django.core import validators class MediaTypes(models.Model): MEDIA_TYPES = [ @@ -13,8 +14,8 @@ class MediaTypes(models.Model): ) class CommonMediaFields(models.Model): - name = models.CharField('Title', maxlength=256) - media_type = models.ForeignKey('MediaType') + name = models.CharField('Title', max_length=256) + media_type = models.ForeignKey('MediaType', on_delete=models.CASCADE) summary = models.TextField('Summary', blank=True) cover = models.ImageField('Cover Image', blank=True) backdrop = models.ImageField('Backdrop Image', blank=True) @@ -27,17 +28,17 @@ class CommonMediaFields(models.Model): ### VideoFields is for movies and tv shows class VideoFields(CommonMediaFields): - tmdb_id = models.PositiveIntegerField('TheMovieDB ID', blank=True) - imdb_id = models.PositiveIntegerField('IMDB ID', blank=True) - tmdb_rating = models.PositiveIntegerField('TheMovieDB rating', max_value=100, blank=True) - mc_rating = models.PositiveIntegerFrield('MetaCritic Rating', max_value=100, blank=True) + tmdb_id = models.CharField('TheMovieDB ID', blank=True) + imdb_id = models.CharField('IMDB ID', blank=True) + imdb_rating = models.DecimalField('IMDB rating', max_digits=5, blank=True, decimal_places=3) + tmdb_rating = models.DecimalField('TheMovieDB rating', max_digits=5, blank=True, decimal_places=3) class Meta: abstract = True class Genres(models.Model): - media = models.ForeignKey('MediaTypes') - genre = models.CharFields('Genre') + media = models.ForeignKey('MediaTypes', on_delete=models.CASCADE) + genre = models.CharField('Genre') class MediaStatus(models.Model): - media = models.ForeignKey('MediaTypes') - status = models.CharFields('Status') + media = models.ForeignKey('MediaTypes', on_delete=models.CASCADE) + status = models.CharField('Status') diff --git a/managemedia/models/movies.py b/managemedia/models/movies.py index 45cf781..e9e4b7f 100644 --- a/managemedia/models/movies.py +++ b/managemedia/models/movies.py @@ -1,10 +1,11 @@ from django.db import models - +from django.core import validators +from .common import VideoFields class Movies(VideoFields): - original_title = models.CharField('Original Title', maxlength=256, blank=True) + original_title = models.CharField('Original Title', max_length=256, blank=True) tagline = models.CharField('Tagline', blank=True) runtime = models.PositiveIntegerField('Total Runtime', blank=True) - rt_rating = models.PositiveIntegerField('Rotten Tomatoes Rating', max_value=100, blank=True) + rt_rating = models.PositiveIntegerField('Rotten Tomatoes Rating', blank=True) am_rating = models.DecimalField('AllMovie Rating', max_digits=3, decimal_places=1, blank=True) class MovieAltTitles(models.Model): diff --git a/managemedia/models/tv.py b/managemedia/models/tv.py index d66398b..bb64e77 100644 --- a/managemedia/models/tv.py +++ b/managemedia/models/tv.py @@ -1,16 +1,16 @@ from django.db import models - +from .common import VideoFields class Television(VideoFields): - episodes = models.PositiveIntegerField('Number of Episodes', min_value=1, blank=True) - seasons = models.PositiveIntegerField('Number of Seasons', min_value=1, blank=True) + episodes = models.PositiveIntegerField('Number of Episodes', blank=True) + seasons = models.PositiveIntegerField('Number of Seasons', blank=True) first_aired = models.DateField('First Aired Date', blank=True) last_aired = models.DateField('Last Aired Date', blank=True) - networks = models.ForeignKey('Networks', blank=True) + networks = models.ForeignKey('Networks', on_delete=models.CASCADE, blank=True) status = models.CharField('Status', blank=True) class Networks(models.Model): name = models.CharField('Network') class ShowtoNetworks(models.Model): - show = models.ForeignKey('Television') - network = models.ForeignKey('Networks') + show = models.ForeignKey('Television', on_delete=models.CASCADE) + network = models.ForeignKey('Networks', on_delete=models.CASCADE) diff --git a/managemedia/models/vgames.py b/managemedia/models/vgames.py index 9a134f1..a6842e4 100644 --- a/managemedia/models/vgames.py +++ b/managemedia/models/vgames.py @@ -1,12 +1,12 @@ from django.db import models - +from .common import CommonMediaFields class VGames(CommonMediaFields): tgdb_id = models.PositiveIntegerField('TheGamesDB ID') - platform = models.ForeignKey('Platform') + platform = models.ForeignKey('Platform', on_delete=models.CASCADE) cover = models.ImageField('Cover Image', blank=True) players = models.PositiveIntegerField('Players', blank=True) coop = models.BooleanField('Co-Op', blank=True) - mc_rating = models.PositiveIntegerFrield('MetaCritic Rating', max_value=100, blank=True) + mc_rating = models.PositiveIntegerField('MetaCritic Rating', blank=True) class Publishers(models.Model): name = models.CharField('Publisher Name') @@ -18,9 +18,9 @@ class Platforms(models.Model): name = models.CharField('Game System') class PublisherMap(models.Model): - publisher = models.ForeignKey('Publishers') - game = models.ForeignKey('VGames') + publisher = models.ForeignKey('Publishers', on_delete=models.CASCADE) + game = models.ForeignKey('VGames', on_delete=models.CASCADE) class DeveloperMap(models.Model): - developer = models.ForeignKey('Developers') - game = models.ForeignKey('VGames') + developer = models.ForeignKey('Developers', on_delete=models.CASCADE) + game = models.ForeignKey('VGames', on_delete=models.CASCADE)