iv-org
/
invidious
mirror of https://github.com/iv-org/invidious.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace EOF carriage returns

This commit is contained in:
broquemonsieur 2023-08-06 10:35:53 -07:00
parent 212509ec60
commit 205c5493db
8 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -7,4 +7,4 @@
/invidious /invidious
/sentry /sentry
/config/config.yml /config/config.yml
.DS_Store .DS_Store

2
docker-compose.yml
View File

@ -54,4 +54,4 @@ services:
test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"] test: ["CMD-SHELL", "pg_isready -U $$POSTGRES_USER -d $$POSTGRES_DB"]
volumes: volumes:
postgresdata: postgresdata:

2
docker/init-invidious-db.sh
View File

@ -11,4 +11,4 @@ psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/annotation
psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/playlists.sql psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/playlists.sql
psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/playlist_videos.sql psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/playlist_videos.sql
psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/compilations.sql psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/compilations.sql
psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/compilation_videos.sql psql --username "$POSTGRES_USER" --dbname "$POSTGRES_DB" < config/sql/compilation_videos.sql

20
src/invidious/compilations.cr
View File

@ -339,16 +339,18 @@ end
def update_first_video_params(compid : String) def update_first_video_params(compid : String)
if compilation = Invidious::Database::Compilations.select(id: compid) if compilation = Invidious::Database::Compilations.select(id: compid)
compilation_index_array = compilation.index compilation_index_array = compilation.index
first_index = compilation_index_array[0] if (compilation_index_array.size > 0)
first_id = Invidious::Database::CompilationVideos.select_id_from_index(first_index) first_index = compilation_index_array[0]
if !first_id.nil? first_id = Invidious::Database::CompilationVideos.select_id_from_index(first_index)
timestamps = Invidious::Database::CompilationVideos.select_timestamps(compid, first_id) if !first_id.nil?
if (!timestamps.nil?) timestamps = Invidious::Database::CompilationVideos.select_timestamps(compid, first_id)
starting_timestamp_seconds=timestamps[0] if (!timestamps.nil?)
ending_timestamp_seconds=timestamps[1] starting_timestamp_seconds=timestamps[0]
Invidious::Database::Compilations.update_first_video_params(compid, first_id, starting_timestamp_seconds, ending_timestamp_seconds) ending_timestamp_seconds=timestamps[1]
Invidious::Database::Compilations.update_first_video_params(compid, first_id, starting_timestamp_seconds, ending_timestamp_seconds)
end
end end
end end
else else
raise NotFoundException.new("Compilation does not exist.") raise NotFoundException.new("Compilation does not exist.")
end end

2
src/invidious/views/add_compilation_items.ecr
View File

@ -31,4 +31,4 @@
</script> </script>
<script src="/js/compilation_widget.js?v=<%= ASSET_COMMIT %>"></script> <script src="/js/compilation_widget.js?v=<%= ASSET_COMMIT %>"></script>
<%= rendered "components/items_paginated" %> <%= rendered "components/items_paginated" %>

2
src/invidious/views/components/compilation_video.ecr
View File

@ -40,4 +40,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

2
src/invidious/views/components/feed_menu.ecr
View File

@ -8,4 +8,4 @@
<%= translate(locale, feed) %> <%= translate(locale, feed) %>
</a> </a>
<% end %> <% end %>
</div> </div>

2
src/invidious/views/feeds/compilations.ecr
View File

@ -26,4 +26,4 @@
<% items_created.each do |item| %> <% items_created.each do |item| %>
<%= rendered "components/item" %> <%= rendered "components/item" %>
<% end %> <% end %>
</div> </div>