Skip to content

Commit b8b704e

Browse files
author
felix13
committed
removed some white space in videos views.py file
1 parent fed9ba8 commit b8b704e

File tree

2 files changed

+3
-141
lines changed

2 files changed

+3
-141
lines changed

videos/views.py

Lines changed: 1 addition & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,106 @@
11
from django.shortcuts import render, get_object_or_404
2-
3-
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
4-
2+
from django.core.paginator import Paginator
53
from django.template.loader import render_to_string
6-
74
from django.contrib.auth.decorators import login_required
8-
95
from django.http import JsonResponse
10-
116
from django.contrib.auth import get_user_model
12-
137
from videos.models import Video
14-
158
from videos.forms import VideoForm
169

1710
User = get_user_model()
1811

1912

2013
@login_required
2114
def home(request):
22-
2315
videos = Video.objects.filter(parent=None).order_by('?')
24-
2516
paginator = Paginator(videos, 6)
26-
2717
page = request.GET.get('page')
28-
2918
all_videos = paginator.get_page(page)
30-
3119
return render(request, "videos/home.html", {'videos': all_videos})
3220

3321

3422
@login_required
3523
def add_video(request):
36-
3724
data = {}
38-
3925
form = VideoForm()
40-
4126
if request.method == "POST":
42-
4327
form = VideoForm(request.POST, request.FILES)
44-
4528
if form.is_valid():
46-
4729
video = form.save(commit=False)
48-
4930
video.user = request.user
50-
5131
video.video_file = form.cleaned_data.get('video_file')
52-
5332
video.post = form.cleaned_data.get('post')
54-
5533
video.save()
56-
5734
data['form_is_valid'] = True
58-
5935
return JsonResponse(data)
60-
6136
else:
62-
6337
data['form_is_valid'] = False
64-
6538
data['video_form'] = render_to_string("videos/video_form.html", {'form': form}, request=request) # noqa: E501
6639

6740
data['video_form'] = render_to_string("videos/video_form.html", {'form': form}, request=request) # noqa: E501
68-
6941
return JsonResponse(data)
7042

7143

7244
@login_required
7345
def edit_video(request, id):
74-
7546
data = {}
76-
7747
video = get_object_or_404(Video, pk=id)
78-
7948
form_instance = VideoForm(instance=video)
80-
8149
if request.method == "POST":
82-
8350
form = VideoForm(request.POST, request.FILES, instance=video)
84-
8551
if form.is_valid():
86-
8752
form.save()
88-
8953
data['form_is_valid'] = True
90-
9154
return JsonResponse(data)
92-
9355
else:
94-
9556
data['form_is_valid'] = False
96-
9757
data['edited_video'] = render_to_string("videos/edit_video.html", {'form': form}, request=request) # noqa: E501
9858

9959
data['edit_video'] = render_to_string("videos/edit_video.html", {'form': form_instance}, request=request) # noqa: E501
100-
10160
return JsonResponse(data)
10261

10362

10463
@login_required
10564
def video(request, id):
106-
10765
video = get_object_or_404(Video, id=id)
108-
10966
side_videos = Video.objects.filter(parent=None).order_by('?').exclude(id=id)[:4] # noqa: E501
110-
11167
return render(request, 'videos/video.html', {'video': video, 'side_videos': side_videos}) # noqa: E501
11268

11369

11470
@login_required
11571
def comment(request):
116-
11772
data = {}
118-
11973
if request.method == 'POST':
120-
12174
video_id = request.POST['video_id']
122-
12375
video = Video.objects.get(pk=video_id)
124-
12576
post = request.POST['post']
126-
12777
post = post.strip()
128-
12978
if len(post) > 0:
130-
13179
user = request.user
132-
13380
video.comment(user=user, post=post)
134-
13581
data['partial_video_comments'] = render_to_string('videos/partial_video_comments.html', {'video': video}, request=request) # noqa: E501
136-
13782
data['comment_count'] = video.calculate_comments()
138-
13983
return JsonResponse(data)
140-
14184
else:
142-
14385
return JsonResponse(data)
14486

14587

14688
@login_required
14789
def profile(request, username):
148-
14990
page_user = get_object_or_404(User, username=username)
150-
15191
all_videos = Video.objects.filter(parent=None).filter(user=page_user)
152-
15392
return render(request, 'videos/profile.html', {'page_user': page_user, 'all_videos': all_videos}) # noqa: E501
15493

15594

15695
@login_required
15796
def remove(request):
158-
15997
data = {}
160-
16198
comment_id = request.POST.get('comment_id')
162-
16399
comment = Video.objects.get(pk=comment_id)
164-
165100
if comment.user == request.user:
166-
167101
parent = comment.parent
168-
169102
comment.delete()
170-
171103
data['comment_count'] = parent.calculate_comments()
172104

173105
data['partial_video_comments'] = render_to_string('videos/partial_video_comments.html', {'video': parent}, request=request) # noqa: E501
174-
175106
return JsonResponse(data)

videos/views.py~

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -1,175 +1,106 @@
11
from django.shortcuts import render, get_object_or_404
2-
3-
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
4-
2+
from django.core.paginator import Paginator
53
from django.template.loader import render_to_string
6-
74
from django.contrib.auth.decorators import login_required
8-
95
from django.http import JsonResponse
10-
116
from django.contrib.auth import get_user_model
12-
137
from videos.models import Video
14-
158
from videos.forms import VideoForm
169

1710
User = get_user_model()
1811

1912

2013
@login_required
2114
def home(request):
22-
23-
videos = Video.objects.filter(parent=None)
24-
15+
videos = Video.objects.filter(parent=None).order_by('?')
2516
paginator = Paginator(videos, 6)
26-
2717
page = request.GET.get('page')
28-
2918
all_videos = paginator.get_page(page)
30-
3119
return render(request, "videos/home.html", {'videos': all_videos})
3220

3321

3422
@login_required
3523
def add_video(request):
36-
3724
data = {}
38-
3925
form = VideoForm()
40-
4126
if request.method == "POST":
42-
4327
form = VideoForm(request.POST, request.FILES)
44-
4528
if form.is_valid():
46-
4729
video = form.save(commit=False)
48-
4930
video.user = request.user
50-
5131
video.video_file = form.cleaned_data.get('video_file')
52-
5332
video.post = form.cleaned_data.get('post')
54-
5533
video.save()
56-
5734
data['form_is_valid'] = True
58-
5935
return JsonResponse(data)
60-
6136
else:
62-
6337
data['form_is_valid'] = False
64-
6538
data['video_form'] = render_to_string("videos/video_form.html", {'form': form}, request=request) # noqa: E501
6639

6740
data['video_form'] = render_to_string("videos/video_form.html", {'form': form}, request=request) # noqa: E501
68-
6941
return JsonResponse(data)
7042

7143

7244
@login_required
7345
def edit_video(request, id):
74-
7546
data = {}
76-
7747
video = get_object_or_404(Video, pk=id)
78-
7948
form_instance = VideoForm(instance=video)
80-
8149
if request.method == "POST":
82-
8350
form = VideoForm(request.POST, request.FILES, instance=video)
84-
8551
if form.is_valid():
86-
8752
form.save()
88-
8953
data['form_is_valid'] = True
90-
9154
return JsonResponse(data)
92-
9355
else:
94-
9556
data['form_is_valid'] = False
96-
9757
data['edited_video'] = render_to_string("videos/edit_video.html", {'form': form}, request=request) # noqa: E501
9858

9959
data['edit_video'] = render_to_string("videos/edit_video.html", {'form': form_instance}, request=request) # noqa: E501
100-
10160
return JsonResponse(data)
10261

10362

10463
@login_required
10564
def video(request, id):
106-
10765
video = get_object_or_404(Video, id=id)
108-
10966
side_videos = Video.objects.filter(parent=None).order_by('?').exclude(id=id)[:4] # noqa: E501
110-
11167
return render(request, 'videos/video.html', {'video': video, 'side_videos': side_videos}) # noqa: E501
11268

11369

11470
@login_required
11571
def comment(request):
116-
11772
data = {}
118-
11973
if request.method == 'POST':
120-
12174
video_id = request.POST['video_id']
122-
12375
video = Video.objects.get(pk=video_id)
124-
12576
post = request.POST['post']
126-
12777
post = post.strip()
128-
12978
if len(post) > 0:
130-
13179
user = request.user
132-
13380
video.comment(user=user, post=post)
134-
13581
data['partial_video_comments'] = render_to_string('videos/partial_video_comments.html', {'video': video}, request=request) # noqa: E501
136-
13782
data['comment_count'] = video.calculate_comments()
138-
13983
return JsonResponse(data)
140-
14184
else:
142-
14385
return JsonResponse(data)
14486

14587

14688
@login_required
14789
def profile(request, username):
148-
14990
page_user = get_object_or_404(User, username=username)
150-
15191
all_videos = Video.objects.filter(parent=None).filter(user=page_user)
152-
15392
return render(request, 'videos/profile.html', {'page_user': page_user, 'all_videos': all_videos}) # noqa: E501
15493

15594

15695
@login_required
15796
def remove(request):
158-
15997
data = {}
160-
16198
comment_id = request.POST.get('comment_id')
162-
16399
comment = Video.objects.get(pk=comment_id)
164-
165100
if comment.user == request.user:
166-
167101
parent = comment.parent
168-
169102
comment.delete()
170-
171103
data['comment_count'] = parent.calculate_comments()
172104

173105
data['partial_video_comments'] = render_to_string('videos/partial_video_comments.html', {'video': parent}, request=request) # noqa: E501
174-
175106
return JsonResponse(data)

0 commit comments

Comments
 (0)