KevinMidboe/zoff
1
0
Fork 0
mirror of https://github.com/KevinMidboe/zoff.git synced 2025-10-29 18:00:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:zoff-music/zoff

Browse Source
This commit is contained in:
Kasper Rynning-Tønnesen
2017-11-13 11:38:06 +01:00
parent b2f38b21e1 4064e60976
commit a43d9a327f
5 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/public/assets/css/style.css
View File

@@ -567,6 +567,10 @@ input[type=text]:focus:not([readonly]) + label, input[type=password]:focus:not([
margin-left: 0px !important;
}
.not-exported-container, .not-imported-container {
height: auto !important;
}
.youtube_clicked{
display: none;
}

8
server/public/assets/js/helpers.js
View File

@@ -324,6 +324,7 @@ var Helper = {
str = str.replace("-", " ");
str = str.replace("-", " ");
str = str.replace(" hq", " ");
str = str.replace("(explicit)", " ");
str = str.replace("lyric video", "");
str = str.replace("lyrics video", "");
str = str.replace("album version", "");
@@ -353,8 +354,15 @@ var Helper = {
str = str.replace("(official)", "");
str = str.replace("official", "");
str = str.replace("(original)", "");
str = str.replace(/ *\[[^\]]*]/, "");
str = str.replace("/w download", "");
str = str.replace("(", " ");
str = str.replace(")", " ");
str = str.replace("vs.", " ");
str = str.replace("/", " ");
str = str.replace("long version", "");
str = str.replace("[]", "");
str = str.replace("()", "");
str = str.replace("|", "");
str = str.replace("feat.", " ");
str = str.replace("feat", " ");

2
server/public/assets/js/list.js
View File

@@ -702,7 +702,7 @@ var List = {
if(data.name.substring(data.name.length-1) == "." && track.substring(track.length-1) != "."){
data.name = data.name.substring(0,data.name.length-1);
}
if(similarity(data.artists[0].name + " - " + data.name, decodeURIComponent(track)) > 0.60) {
if(similarity(data.artists[0].name + " - " + data.name, decodeURIComponent(track)) > 0.60 || (data.artists.length > 1 && similarity(data.artists[0].name + " " + data.artists[1].name + " - " + data.name, decodeURIComponent(track)))) {
found = true;
List.uris.push(data.uri);
Helper.log("Found", track);

1
server/public/assets/js/search.js
View File

@@ -236,6 +236,7 @@ var Search = {
data.snippet.channelTitle.toLowerCase().indexOf("vevo") == -1)))
))
not_matched = true;
else if(duration > 1800) not_matched = true;
return false;
});

10
server/public/partials/channel/panel.handlebars
View File

@@ -297,7 +297,7 @@
<ul>
<li class="white-bg">
<div class="input-field field-settings youtube_unclicked import-buttons">
<a class="modal-trigger waves-effect red btn import-youtube" title="Import from YouTube playlist">
<a class="waves-effect red btn import-youtube" title="Import from YouTube playlist">
<img src="/assets/images/youtube.png" class="youtube_logo" alt="Youtube Logo" />
</a>
</div>
@@ -315,7 +315,7 @@
</li>
<li class="white-bg">
<div class="input-field field-settings spotify_unauthenticated import-buttons">
<a class="modal-trigger waves-effect green lighten btn import-spotify-auth" title="Import Spotify playlist">
<a class="waves-effect green lighten btn import-spotify-auth" title="Import Spotify playlist">
<img src="/assets/images/spotify.png" class="left spotify_logo" alt="Spotify Logo" />Spotify
</a>
</div>
@@ -359,14 +359,14 @@
<ul>
<li class="white-bg">
<div class="input-field field-settings youtube_export_button export-buttons">
<a class="modal-trigger waves-effect red btn export-youtube" id="listExport" title="Export to YouTube">
<a class="waves-effect red btn export-youtube" id="listExport" title="Export to YouTube">
<img src="/assets/images/youtube.png" class="youtube_logo" alt="Youtube Logo" />
</a>
</div>
</li>
<li class="white-bg">
<div class="input-field field-settings spotify_export_button export-buttons">
<a class="modal-trigger waves-effect green lighten btn export-spotify-auth" title="Export Spotify playlist">
<a class="waves-effect green lighten btn export-spotify-auth" title="Export Spotify playlist">
<img src="/assets/images/spotify.png" class="left spotify_logo" alt="Spotify Logo" />Spotify
</a>
</div>
@@ -383,7 +383,7 @@
</div>
</div>
</li>
<li class="white-bg">
<li class="white-bg not-exported-height">
<div class="exported-list input-field field-settings export-buttons">
</div>
<ul>