technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-09 18:52:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source
This commit is contained in:
oslomp
2019-01-30 15:55:10 +01:00
parent 12ad8135bd d214d8f72d
commit add542a5c4
31 changed files with 712 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
marietje/api/urls.py
View File

@ -13,7 +13,6 @@ urlpatterns = [
url(r'^request', views.request),
url(r'^report', views.report),
url(r'^skip', views.skip),
url(r'^moveup', views.move_up),
url(r'^movedown', views.move_down),
url(r'^cancel', views.cancel),
url(r'^upload', views.upload),

12
marietje/api/views.py
View File

@ -111,7 +111,7 @@ def songs(request):
except EmptyPage:
songs = paginator.page(paginator.num_pages)
songs_dict = [song_to_dict(song, user=True) for song in songs.object_list]
songs_dict = [song_to_dict(song, include_user=True) for song in songs.object_list]
return JsonResponse({
'per_page': pagesize,
'current_page': page,
@ -188,16 +188,6 @@ def skip(request):
return JsonResponse({})
@require_http_methods(["POST"])
@api_auth_required
def move_up(request):
if not request.user.has_perm('queues.can_move'):
return HttpResponseForbidden()
playlist_song = get_object_or_404(PlaylistSong, id=request.POST.get('id'))
playlist_song.move_up()
return JsonResponse({})
@require_http_methods(["POST"])
@api_auth_required
def move_down(request):

3
marietje/marietje/forms.py
View File

@ -5,9 +5,6 @@ from django.utils.translation import ugettext_lazy as _
class AuthenticationForm(BaseAuthenticationForm):
def __init__(self, request=None, *args, **kwargs):
super(AuthenticationForm, self).__init__(request, *args, **kwargs)
def confirm_login_allowed(self, user):
if user.activation_token:
raise forms.ValidationError(

6
marietje/marietje/models.py
View File

@ -1,14 +1,14 @@
from django.db import models
from queues.models import Queue
from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
from django.contrib.auth.hashers import make_password
from django.contrib.auth.models import PermissionsMixin
from django.contrib.auth.validators import ASCIIUsernameValidator, UnicodeUsernameValidator
from django.core.mail import send_mail
from django.db import models
from django.utils import six, timezone
from django.utils.translation import ugettext_lazy as _
from django.core.mail import send_mail
from marietje.utils import get_first_queue
from queues.models import Queue
class UserManager(BaseUserManager):

10
marietje/marietje/settings.py
View File

@ -62,7 +62,7 @@ DATABASES = {
'PASSWORD': 'v8TzZwdAdSi7Tk5I',
'HOST': 'localhost',
'PORT': '3306',
'OPTIONS': { 'init_command': "SET sql_mode='STRICT_TRANS_TABLES'" },
'OPTIONS': {'init_command': "SET sql_mode='STRICT_TRANS_TABLES'"},
}
}
@ -95,12 +95,12 @@ CACHES = {
'default': {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
'LOCATION': '/var/tmp/MarietjeDjango_cache/default',
'OPTIONS': { 'MAX_ENTRIES': 1000 },
'OPTIONS': {'MAX_ENTRIES': 1000},
},
'song_search': {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
'LOCATION': '/var/tmp/MarietjeDjango_cache/song_search',
'OPTIONS': { 'MAX_ENTRIES': 1000 },
'OPTIONS': {'MAX_ENTRIES': 1000},
},
'userstats': {
'BACKEND': 'django.core.cache.backends.filebased.FileBasedCache',
@ -144,8 +144,8 @@ CONTACT_EMAIL = 'marietje@science.ru.nl'
STATS_TOP_COUNT = 50
STATS_REQUEST_IGNORE_USER_IDS = []
ISSUES_URL = 'https://gitlab.science.ru.nl/Marietje/MarietjeDjango/issues'
MERGE_REQUESTS_URL = 'https://gitlab.science.ru.nl/Marietje/MarietjeDjango/merge_requests'
ISSUES_URL = 'https://gitlab.science.ru.nl/dsprenkels/MarietjeDjango/issues'
MERGE_REQUESTS_URL = 'https://gitlab.science.ru.nl/dsprenkels/MarietjeDjango/merge_requests'
TRUSTED_IP_RANGES = [
'131.174.0.0/16', # RU wired
'145.116.136.0/22', # eduroam

8
marietje/marietje/static/css/custom.css
View File

@ -21,3 +21,11 @@
footer {
text-align: center;
}
.marietjequeue {
color: #777777;
}
.marietjequeue-start {
border-top: 4px double #777777;
}

44
marietje/marietje/static/js/queue.js
View File

@ -49,13 +49,16 @@ $(function () {
var songId = $(this).data('report-song-id');
var message = prompt("What is wrong with the song?");
if (message == "") {
alert("Please enter a message.");
createAlert('danger', 'Please enter a message.');
return false
}
if (message == null) {
return false
}
$.post('/api/report', {id: songId, msg: message, csrfmiddlewaretoken: csrf_token}, function (result) {
console.log(result);
if (result.success) {
alert("Thanks for the report!");
createAlert('success', 'Thanks for your song report!');
}
});
return false;
@ -194,27 +197,56 @@ function renderQueue(playNextAt, now)
{
$('.queuebody').empty();
var timeToPlay = playNextAt - now;
var canDeletePrevious = false;
$.each(queue, function (id, song) {
var requestedBy = song.requested_by;
var reqMarietje = requestedBy != 'Marietje';
var startMarietje = false
//checks if id is the last item and returns false if the next song is Marietje, while the current song is not.
if(id === queue.length-1){
var requestNext = false
} else {
var requestNext = !((queue[id+1].requested_by === 'Marietje') && (requestedBy !== 'Marietje'))
}
//checks if id is the first item and returns false if the previous song is not Marietje, while the current song is.
if(id === 0){
var requestPrev = false
} else {
var prevItem = queue[id-1].id
if(queue[id-1].requested_by !== 'Marietje'){
var requestPrev = false
if (requestedBy == 'Marietje'){
var startMarietje = true
} else {
var requestPrev = true
}
} else {var requestPrev = true}
}
var canDelete = song.can_move_down || canMoveSongs;
var canMoveDown = canDelete && id < queue.length - 1;
var canMoveUp = canMoveSongs && requestPrev || canDeletePrevious && reqMarietje && requestPrev;
var canMoveDown = canMoveSongs && requestNext || canDelete && reqMarietje && requestNext;
var artist = song.song.artist.trim() === '' ? '?' : song.song.artist;
var title = song.song.title.trim() === '' ? '?' : song.song.title;
var marietjeclass = reqMarietje ? '' : ' class="marietjequeue"';
var marietjestartclass = startMarietje ? ' class="marietjequeue marietjequeue-start"' : '';
showTime = showTimeToPlay ? (timeToPlay < 0 ? '' : timeToPlay.secondsToMMSS()) : (playNextAt < now ? '' : playNextAt.timestampToHHMMSS())
$('.queuebody:last-child').append('<tr><td class="artist">' + artist
$('.queuebody:last-child').append('<tr' + marietjestartclass + marietjeclass + '>' + '<td class="artist">' + artist
+ '</td><td class="title">' + title + '</td><td class="hidden-xs requested-by">' + requestedBy
+ '</td><td class="hidden-xs plays-at" style="text-align: right;">' + showTime
+ '</td><td>' + '<a href="#" class="glyphicon glyphicon-arrow-up'
+ (canMoveSongs && id !== 0 ? '' : ' invisible')
+ '" onclick="return moveUp(' + song.id
+ (canMoveUp && id !== 0 ? '' : ' invisible')
+ '" onclick=" return moveDown(' + prevItem
+ ')"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="glyphicon glyphicon-arrow-down'
+ (canMoveDown ? '' : ' invisible') + '" onclick="return moveDown('
+ song.id + ')"></a>&nbsp;&nbsp;&nbsp;&nbsp;<a href="#" class="glyphicon glyphicon-trash'
+ (canDelete ? '' : ' invisible') + '" onclick="return cancelSong('
+ song.id + ')"></a></td></tr>');
timeToPlay += parseInt(song.song.duration);
canDeletePrevious = canDelete
if(playNextAt >= now)
{
playNextAt += parseInt(song.song.duration);

29
marietje/marietje/utils.py
View File

@ -1,10 +1,13 @@
import socket, struct, binascii
import binascii
import socket
import struct
from django.conf import settings
from queues.models import Queue, Playlist
from django.http import StreamingHttpResponse
from queues.models import Queue, Playlist
def song_to_dict(song, hash=False, user=False, replaygain=False):
def song_to_dict(song, include_hash=False, include_user=False, include_replaygain=False, **options):
data = {
'id': song.id,
'artist': song.artist,
@ -12,13 +15,13 @@ def song_to_dict(song, hash=False, user=False, replaygain=False):
'duration': song.duration,
}
if hash:
if include_hash:
data['hash'] = song.hash
if user is not None and song.user is not None and song.user.name:
if include_user is not None and song.user is not None and song.user.name:
data['uploader_name'] = song.user.name
if replaygain:
if include_replaygain:
data['rg_gain'] = song.rg_gain
data['rg_peak'] = song.rg_peak
@ -44,9 +47,9 @@ def send_to_bertha(file):
for chunk in file.chunks():
sock.sendall(chunk)
sock.shutdown(socket.SHUT_WR)
hash = binascii.hexlify(sock.recv(64))
song_hash = binascii.hexlify(sock.recv(64))
sock.close()
return hash
return song_hash
def get_first_queue():
@ -61,10 +64,10 @@ def get_first_queue():
return queue
def bertha_stream(hash):
def bertha_stream(song_hash):
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.connect(settings.BERTHA_HOST)
sock.sendall(struct.pack("<B", 2) + binascii.unhexlify(hash))
sock.sendall(struct.pack("<B", 2) + binascii.unhexlify(song_hash))
data = sock.recv(4096)
while data:
yield data
@ -72,7 +75,7 @@ def bertha_stream(hash):
sock.close()
def get_from_bertha(hash):
response = StreamingHttpResponse(bertha_stream(hash))
response['Content-Disposition'] = 'attachment; filename="{}"'.format(hash)
def get_from_bertha(song_hash):
response = StreamingHttpResponse(bertha_stream(song_hash))
response['Content-Disposition'] = 'attachment; filename="{}"'.format(song_hash)
return response

3
marietje/marietje/views.py
View File

@ -8,8 +8,7 @@ from django.core.mail import send_mail
from django.shortcuts import render, redirect, get_object_or_404
from django.urls import reverse
from marietje.utils import get_first_queue
from .forms import RegistrationForm, ResetPasswordForm
from .forms import ResetPasswordForm
def register(request):

3
marietje/metrics/admin.py
View File

@ -1,3 +0,0 @@
from django.contrib import admin
# Register your models here.

3
marietje/metrics/models.py
View File

@ -1,3 +0,0 @@
from django.db import models
# Create your models here.

3
marietje/metrics/tests.py
View File

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

10
marietje/metrics/views.py
View File

@ -1,4 +1,3 @@
from django.db.models import Count, Q
from django.http import HttpResponse
from django.db.utils import OperationalError
@ -16,13 +15,12 @@ queue_users_gauge = Gauge('marietje_queue_users', 'Users holding a queue at some
try:
for queue in Queue.objects.all():
def _get_queue_length():
return (PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0)
.count())
return PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0).count()
def _get_queue_duration():
playlist_songs = (PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0)
.select_related('song')
.all())
.select_related('song')
.all())
return sum(ps.song.duration for ps in playlist_songs)
def _get_queue_distinct_users():
@ -31,7 +29,7 @@ try:
# that much of confidence that it would also work on mysql.
# Furtermore, we do not expect the queue to be very long at any moment.
return len(set(PlaylistSong.objects.filter(playlist=queue.playlist_id, state=0)
.values_list('user')))
.values_list('user')))
queue_length_gauge.labels(name=queue).set_function(_get_queue_length)
queue_duration_gauge.labels(name=queue).set_function(_get_queue_duration)

3
marietje/playerapi/admin.py
View File

@ -1,3 +0,0 @@
from django.contrib import admin
# Register your models here.

3
marietje/playerapi/models.py
View File

@ -1,3 +0,0 @@
from django.db import models
# Create your models here.

3
marietje/playerapi/tests.py
View File

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

19
marietje/playerapi/views.py
View File

@ -14,16 +14,16 @@ from .decorators import token_required
@csrf_exempt
@token_required
def queue(request):
queue = get_object_or_404(Queue, id=request.POST.get('queue'))
current_queue = get_object_or_404(Queue, id=request.POST.get('queue'))
commands = queue.queuecommand_set.filter(executed=False)
commands = current_queue.queuecommand_set.filter(executed=False)
for command in commands:
command.executed = True
command.save()
return JsonResponse({
'current_song': playlist_song_to_dict(queue.current_song(), hash=True, replaygain=True),
'queue': [playlist_song_to_dict(playlist_song, hash=True, replaygain=True) for playlist_song in queue.queue()[:1]],
'current_song': playlist_song_to_dict(current_queue.current_song(), include_hash=True, include_replaygain=True),
'queue': [playlist_song_to_dict(playlist_song, include_hash=True, include_replaygain=True) for playlist_song in current_queue.queue()[:1]],
'commands': [command.command for command in commands]
})
@ -31,9 +31,9 @@ def queue(request):
@csrf_exempt
@token_required
def play(request):
queue = get_object_or_404(Queue, id=request.POST.get('queue'))
queue.started_at = timezone.now()
queue.save()
current_queue = get_object_or_404(Queue, id=request.POST.get('queue'))
current_queue.started_at = timezone.now()
current_queue.save()
current_song = queue.current_song()
current_song.played_at = queue.started_at
current_song.save()
@ -41,11 +41,12 @@ def play(request):
return JsonResponse({})
# pylint: disable=redefined-builtin
@csrf_exempt
@token_required
def next(request):
queue = get_object_or_404(Queue, id=request.POST.get('queue'))
player_song = queue.current_song()
current_queue = get_object_or_404(Queue, id=request.POST.get('queue'))
player_song = current_queue.current_song()
player_song.state = 2
player_song.save()
return JsonResponse({})

18
marietje/queues/models.py
View File

@ -1,7 +1,5 @@
import time
from django.db import models
from django.db.models import Q, Max
from django.db.models import Q
from django.conf import settings
from django.utils import timezone
@ -47,16 +45,9 @@ class PlaylistSong(models.Model):
)
state = models.IntegerField(default=0, db_index=True, choices=STATECHOICE)
def move_up(self):
other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__lt=self.id)\
.order_by('-id').first()
self.switch_order(other_song)
def move_down(self):
other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__gt=self.id).order_by('id').first()
self.switch_order(other_song)
def switch_order(self, other_song):
other_song = PlaylistSong.objects.filter(playlist=self.playlist, id__gt=self.id).first()
old_id = self.id
self.id = other_song.id
other_song.id = old_id
@ -106,7 +97,7 @@ class Queue(models.Model):
def current_song(self):
songs = self.get_songs()
if len(songs) < 1:
if not songs:
return None
song = songs[0]
if song.state != 1:
@ -143,7 +134,8 @@ class Queue(models.Model):
playlist_song.save()
# If the song was auto-queue'd, then remove it from the auto-queue
autolist_songs = PlaylistSong.objects.filter(playlist=self.random_playlist, state=0, song=song).delete()
autolist_songs = PlaylistSong.objects.filter(playlist=self.random_playlist, state=0, song=song)
autolist_songs.delete()
return None

3
marietje/queues/tests.py
View File

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

8
marietje/queues/urls.py
View File

@ -1,8 +1,2 @@
from django.conf.urls import url
from . import views
app_name = 'queue'
urlpatterns = [
]
urlpatterns = []

4
marietje/songs/admin.py
View File

@ -13,7 +13,8 @@ class SongAdmin(admin.ModelAdmin):
search_fields = ('artist', 'title', 'user__name')
inlines = [ReportNoteInline]
def reports(self, song):
@staticmethod
def reports(song):
return ReportNote.objects.filter(song=song).count()
@staticmethod
@ -31,3 +32,4 @@ class SongAdmin(admin.ModelAdmin):
class ReportNoteAdmin(admin.ModelAdmin):
list_display = ('song', 'note', 'user')
search_fields = ('song__artist', 'song__title', 'user__name')
readonly_fields = ('song',)

7
marietje/songs/models.py
View File

@ -43,7 +43,8 @@ class Song(models.Model):
return self.artist + ' - ' + self.title
class ReportNote(models.Model):
song = models.ForeignKey(Song,
song = models.ForeignKey(
Song,
on_delete=models.CASCADE,
blank=False,
null=False,
@ -54,7 +55,9 @@ class ReportNote(models.Model):
blank=True,
null=True,
db_index=True)
note = models.TextField(verbose_name='reason', blank=True,
note = models.TextField(
verbose_name='reason',
blank=True,
help_text='reason for edit request')
def __str__(self):

3
marietje/songs/tests.py
View File

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

6
marietje/songs/views.py
View File

@ -1,5 +1,5 @@
from django.shortcuts import render, get_object_or_404, redirect
from django.contrib.auth.decorators import login_required, permission_required
from django.contrib.auth.decorators import login_required
from .models import Song
@ -14,8 +14,8 @@ def manage(request):
@login_required
def edit(request, id):
song = get_object_or_404(Song, pk=id, user=request.user)
def edit(request, song_id):
song = get_object_or_404(Song, pk=song_id, user=request.user)
if not request.POST:
return render(request, 'songs/edit.html', {'song': song})

3
marietje/stats/admin.py
View File

@ -1,3 +0,0 @@
from django.contrib import admin
# Register your models here.

3
marietje/stats/models.py
View File

@ -1,3 +0,0 @@
from django.db import models
# Create your models here.

3
marietje/stats/tests.py
View File

@ -1,3 +0,0 @@
from django.test import TestCase
# Create your tests here.

21
marietje/stats/utils.py
View File

@ -18,9 +18,8 @@ def recache_stats():
def recache_user_stats():
users = User.objects.exclude(
Q(id=None)
| Q(id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values('id')
users = User.objects.exclude(Q(id=None)
| Q(id__in=settings.STATS_REQUEST_IGNORE_USER_IDS)).values('id')
for user in users:
new_stats = user_stats(user['id'])
cacheloc = 'userstats_{}'.format(user['id'])
@ -102,11 +101,12 @@ def compute_stats():
'-total', 'song__artist')[:settings.STATS_TOP_COUNT]
most_played_songs_14_days = PlaylistSong.objects.filter(
state=2, played_at__gte=timezone.now() - timedelta(days=14)).exclude(
user_id=None).values(
'song__artist',
'song__title').annotate(total=Count('id')).order_by(
'-total', 'song__artist')[:settings.STATS_TOP_COUNT]
state=2, played_at__gte=timezone.now() -
timedelta(days=14)).exclude(user_id=None).values(
'song__artist',
'song__title').annotate(total=Count('id')).order_by(
'-total', 'song__artist')[:settings.STATS_TOP_COUNT]
time_requested = PlaylistSong.objects.filter(state=2).exclude(
Q(user_id=None)
@ -143,6 +143,11 @@ def compute_stats():
avg_dur_sec = '0' + str(avg_dur_sec)
time['avg_dur'] = '{}:{}'.format(avg_dur_min, avg_dur_sec)
# Convert requested time to days
time_requested = list(time_requested)
for tr in time_requested:
tr['duration'] = str(round(tr['total'] / 86400, 2)) + ' days'
return {
'last_updated': last_updated,
'total_uploads': total_uploads,

22
marietje/stats/views.py
View File

@ -5,29 +5,30 @@ from django.shortcuts import render
def stats(request):
stats = caches['default'].get('stats')
stats_data = caches['default'].get('stats')
status = 503
current_age = None
current_age_text = None
if stats:
if stats_data:
status = 200
current_age_text = age_text(stats['last_updated'])
current_age_text = age_text(stats_data['last_updated'])
data = {'stats': stats, 'current_age': current_age, 'current_age_text': current_age_text}
data = {'stats': stats_data, 'current_age': current_age, 'current_age_text': current_age_text}
return render(request, 'stats/stats.html', data, status=status)
def user_stats(request):
stats = caches['userstats'].get('userstats_{}'.format(request.user.id))
stats_data = caches['default'].get('userstats_{}'.format(request.user.id))
status = 503
current_age = None
current_age_text = None
if stats:
if stats_data:
status = 200
current_age_text = age_text(stats['last_updated'])
current_age_text = age_text(stats_data['last_updated'])
data = {'stats': stats, 'current_age': current_age, 'current_age_text': current_age_text}
data = {'stats': stats_data, 'current_age': current_age, 'current_age_text': current_age_text}
return render(request, 'stats/user.html', data, status=status)
def age_text(last_updated):
@ -38,7 +39,6 @@ def age_text(last_updated):
hourstr = "hour" if hours == 1 else "hours"
if current_age < timedelta(hours=1):
return 'Stats were updated {:.0f} {} ago.'.format(minutes, minutestr)
else:
return 'Stats were updated {:.0f} {} and {:.0f} {} ago.'.format(
hours, hourstr, minutes, minutestr)
return 'Stats were updated {:.0f} {} and {:.0f} {} ago.'.format(
hours, hourstr, minutes, minutestr)