From e3a02b9272e8abe6cc7820ac95ce7638fb6cc5b7 Mon Sep 17 00:00:00 2001 From: Zambom Date: Fri, 9 Jun 2017 17:11:08 -0300 Subject: [PATCH] Some adjusts in backup and restore --- file_link/serializers.py | 20 +------------------- goals/serializers.py | 6 ------ links/serializers.py | 6 ------ pdf_file/serializers.py | 20 +------------------- pdf_file/views.py | 2 +- subjects/views.py | 22 ++++++++++++++++------ topics/serializers.py | 15 ++++++++------- webpage/serializers.py | 6 ------ youtube_video/serializers.py | 6 ------ 9 files changed, 27 insertions(+), 76 deletions(-) diff --git a/file_link/serializers.py b/file_link/serializers.py index 697bf47..785c7a0 100644 --- a/file_link/serializers.py +++ b/file_link/serializers.py @@ -92,13 +92,7 @@ class SimpleFileLinkSerializer(serializers.ModelSerializer): data["topic"] = topic else: data["topic"] = get_object_or_404(Topic, id = topic["id"]) - - if not data["file_content"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, data["file_content"]), encoding="latin-1") - file = File(f) - - data["file_content"] = file - + file_link_data = data pendencies = file_link_data["pendencies_resource"] @@ -208,12 +202,6 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer): else: data["topic"] = get_object_or_404(Topic, id = topic["id"]) - if not data["file_content"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, data["file_content"]), encoding="latin-1") - file = File(f) - - data["file_content"] = file - file_link_data = data pendencies = file_link_data["pendencies_resource"] @@ -260,12 +248,6 @@ class CompleteFileLinkSerializer(serializers.ModelSerializer): if not l_exists.exists(): Log.objects.create(**log) else: - if not student_data["image"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1") - file = File(f) - - student_data["image"] = file - student = User() student.email = student_data["email"] student.username = student_data["username"] diff --git a/goals/serializers.py b/goals/serializers.py index e5f74d3..68e88df 100644 --- a/goals/serializers.py +++ b/goals/serializers.py @@ -203,12 +203,6 @@ class CompleteGoalSerializer(serializers.ModelSerializer): if not l_exists.exists(): Log.objects.create(**log) else: - if not student_data["image"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1") - file = File(f) - - student_data["image"] = file - student = User() student.email = student_data["email"] student.username = student_data["username"] diff --git a/links/serializers.py b/links/serializers.py index 46745cc..0bdd473 100644 --- a/links/serializers.py +++ b/links/serializers.py @@ -185,12 +185,6 @@ class CompleteLinkSerializer(serializers.ModelSerializer): if not l_exists.exists(): Log.objects.create(**log) else: - if not student_data["image"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1") - file = File(f) - - student_data["image"] = file - student = User() student.email = student_data["email"] student.username = student_data["username"] diff --git a/pdf_file/serializers.py b/pdf_file/serializers.py index 80c9120..7c5f240 100644 --- a/pdf_file/serializers.py +++ b/pdf_file/serializers.py @@ -86,12 +86,6 @@ class SimplePDFFileSerializer(serializers.ModelSerializer): else: data["topic"] = get_object_or_404(Topic, id = topic["id"]) - if not data["file"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, data["file"]), encoding="latin-1") - file = File(f) - - data["file"] = file - pdf_data = data pendencies = pdf_data["pendencies_resource"] @@ -183,6 +177,7 @@ class CompletePDFFileSerializer(serializers.ModelSerializer): pdf = None if not topic["id"] is None: + if "subject" in topic: r_exits = Resource.objects.filter(topic__subject = topic["subject"], name__unaccent__iexact = data["name"]) else: @@ -201,13 +196,6 @@ class CompletePDFFileSerializer(serializers.ModelSerializer): else: data["topic"] = get_object_or_404(Topic, id = topic["id"]) - - if not data["file"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, data["file"]), encoding="latin-1") - file = File(f) - - data["file"] = file - pdf_data = data pendencies = pdf_data["pendencies_resource"] @@ -254,12 +242,6 @@ class CompletePDFFileSerializer(serializers.ModelSerializer): if not l_exists.exists(): Log.objects.create(**log) else: - if not student_data["image"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1") - file = File(f) - - student_data["image"] = file - student = User() student.email = student_data["email"] student.username = student_data["username"] diff --git a/pdf_file/views.py b/pdf_file/views.py index e0df900..e1b90a9 100644 --- a/pdf_file/views.py +++ b/pdf_file/views.py @@ -56,7 +56,6 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView): context['pdf_file'] = pdf_file context['subject'] = pdf_file.topic.subject - self.log_context['category_id'] = pdf_file.topic.subject.category.id self.log_context['category_name'] = pdf_file.topic.subject.category.name self.log_context['category_slug'] = pdf_file.topic.subject.category.slug @@ -81,6 +80,7 @@ class ViewPDFFile(LoginRequiredMixin, LogMixin, generic.TemplateView): if not path.exists(pdf_file.file.path): raise Http404() + if pdf_file.show_window: response = HttpResponse(open(pdf_file.file.path, 'rb').read(),content_type = 'application/pdf') return response diff --git a/subjects/views.py b/subjects/views.py index b5835e3..7453587 100644 --- a/subjects/views.py +++ b/subjects/views.py @@ -813,13 +813,23 @@ def realize_backup(request, subject): serializer_p = SimplePDFFileSerializer(pdffiles, many = True) serializer_g = SimpleGoalSerializer(goals, many = True) + if len(serializer_w.data) > 0: + data_list.append(serializer_w.data) - data_list.append(serializer_w.data) - data_list.append(serializer_y.data) - data_list.append(serializer_f.data) - data_list.append(serializer_l.data) - data_list.append(serializer_p.data) - data_list.append(serializer_g.data) + if len(serializer_y.data) > 0: + data_list.append(serializer_y.data) + + if len(serializer_f.data) > 0: + data_list.append(serializer_f.data) + + if len(serializer_l.data) > 0: + data_list.append(serializer_l.data) + + if len(serializer_p.data) > 0: + data_list.append(serializer_p.data) + + if len(serializer_g.data) > 0: + data_list.append(serializer_g.data) json.dump(data_list, file) diff --git a/topics/serializers.py b/topics/serializers.py index 5d04f03..176974f 100644 --- a/topics/serializers.py +++ b/topics/serializers.py @@ -16,15 +16,16 @@ class TopicSerializer(serializers.ModelSerializer): if topic.exists(): data = topic[0].__dict__ else: - topic = Topic.objects.filter(subject = subject, repository = True) + data["id"] = "" + data["subject"] = subject + data["order"] = Topic.objects.filter(subject = subject).count() + 1 - if topic.exists(): - data = topic[0].__dict__ - else: - data["id"] = "" - data["subject"] = subject - data["order"] = Topic.objects.filter(subject = subject).count() + 1 + if data["repository"] == True: + topic = Topic.objects.filter(subject = subject, repository = True) + if topic.exists(): + data = topic[0].__dict__ + return data class Meta: diff --git a/webpage/serializers.py b/webpage/serializers.py index 2719a97..2bfe96b 100644 --- a/webpage/serializers.py +++ b/webpage/serializers.py @@ -186,12 +186,6 @@ class CompleteWebpageSerializer(serializers.ModelSerializer): if not l_exists.exists(): Log.objects.create(**log) else: - if not student_data["image"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1") - file = File(f) - - student_data["image"] = file - student = User() student.email = student_data["email"] student.username = student_data["username"] diff --git a/youtube_video/serializers.py b/youtube_video/serializers.py index ec4d58c..84bfdf5 100644 --- a/youtube_video/serializers.py +++ b/youtube_video/serializers.py @@ -187,12 +187,6 @@ class CompleteYTVideoSerializer(serializers.ModelSerializer): if not l_exists.exists(): Log.objects.create(**log) else: - if not student_data["image"] is None: - f = open(os.path.join(settings.MEDIA_ROOT, student_data["image"]), encoding="latin-1") - file = File(f) - - student_data["image"] = file - student = User() student.email = student_data["email"] student.username = student_data["username"] -- libgit2 0.21.2