Compare commits
No commits in common. "v3" and "v5" have entirely different histories.
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -2,3 +2,5 @@ bin/
|
|||
obj/
|
||||
/packages/
|
||||
/data/
|
||||
migration.sql
|
||||
.idea/
|
||||
|
|
|
|||
0
.idea/.gitignore
vendored
0
.idea/.gitignore
vendored
2
.idea/.idea.c3stream/.idea/.gitignore
vendored
2
.idea/.idea.c3stream/.idea/.gitignore
vendored
|
|
@ -1,2 +0,0 @@
|
|||
# Default ignored files
|
||||
/workspace.xml
|
||||
|
|
@ -1,142 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ContentModelStore">
|
||||
<e p="$USER_HOME$/Library/Caches/Rider2019.3/extResources" t="IncludeRecursive" />
|
||||
<e p="$USER_HOME$/Library/Caches/Rider2019.3/resharper-host/local/Transient/ReSharperHost/v193/SolutionCaches/_c3stream.-879192168.00" t="ExcludeRecursive" />
|
||||
<e p="$APPLICATION_CONFIG_DIR$/javascript/extLibs/http_kit.fontawesome.com_c1a632a160.js" t="IncludeRecursive" />
|
||||
<e p="$APPLICATION_CONFIG_DIR$/javascript/extLibs/http_pro.fontawesome.com_releases_v5.11.2_css_all.css" t="IncludeRecursive" />
|
||||
<e p="$PROJECT_DIR$" t="IncludeRecursive">
|
||||
<e p=".gitignore" t="Include" />
|
||||
<e p="appsettings.Development.json" t="Include" />
|
||||
<e p="appsettings.json" t="Include" />
|
||||
<e p="bin" t="ExcludeRecursive" />
|
||||
<e p="c3stream.cs" t="Include" />
|
||||
<e p="c3stream.csproj" t="IncludeRecursive" />
|
||||
<e p="c3stream.sln" t="IncludeFlat" />
|
||||
<e p="LICENSE" t="Include" />
|
||||
<e p="obj" t="ExcludeRecursive">
|
||||
<e p="Debug" t="Include">
|
||||
<e p="netcoreapp3.1" t="Include">
|
||||
<e p="c3stream.AssemblyInfo.cs" t="Include" />
|
||||
<e p="c3stream.RazorAssemblyInfo.cs" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
</e>
|
||||
<e p="packages" t="ExcludeRecursive" />
|
||||
<e p="Pages" t="Include">
|
||||
<e p="_ViewImports.cshtml" t="Include" />
|
||||
<e p="_ViewStart.cshtml" t="Include" />
|
||||
<e p="Conference.cshtml" t="Include" />
|
||||
<e p="Conference.cshtml.cs" t="Include" />
|
||||
<e p="Error.cshtml" t="Include" />
|
||||
<e p="Error.cshtml.cs" t="Include" />
|
||||
<e p="Index.cshtml" t="Include" />
|
||||
<e p="Index.cshtml.cs" t="Include" />
|
||||
<e p="Info.cshtml" t="Include" />
|
||||
<e p="Info.cshtml.cs" t="Include" />
|
||||
<e p="Privacy.cshtml" t="Include" />
|
||||
<e p="Privacy.cshtml.cs" t="Include" />
|
||||
<e p="Shared" t="Include">
|
||||
<e p="_Layout.cshtml" t="Include" />
|
||||
<e p="_ValidationScriptsPartial.cshtml" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
<e p="Properties" t="Include">
|
||||
<e p="launchSettings.json" t="Include" />
|
||||
</e>
|
||||
<e p="README.md" t="Include" />
|
||||
<e p="Startup.cs" t="Include" />
|
||||
<e p="Types.cs" t="Include" />
|
||||
<e p="wwwroot" t="Include">
|
||||
<e p="css" t="Include">
|
||||
<e p="fa.css" t="Include" />
|
||||
<e p="site.css" t="Include" />
|
||||
</e>
|
||||
<e p="favicon.ico" t="Include" />
|
||||
<e p="js" t="Include">
|
||||
<e p="site.js" t="Include" />
|
||||
</e>
|
||||
<e p="lib" t="Include">
|
||||
<e p="bootstrap" t="Include">
|
||||
<e p="dist" t="Include">
|
||||
<e p="css" t="Include">
|
||||
<e p="bootstrap-grid.css" t="Include" />
|
||||
<e p="bootstrap-grid.css.map" t="Include" />
|
||||
<e p="bootstrap-grid.min.css" t="Include" />
|
||||
<e p="bootstrap-grid.min.css.map" t="Include" />
|
||||
<e p="bootstrap-reboot.css" t="Include" />
|
||||
<e p="bootstrap-reboot.css.map" t="Include" />
|
||||
<e p="bootstrap-reboot.min.css" t="Include" />
|
||||
<e p="bootstrap-reboot.min.css.map" t="Include" />
|
||||
<e p="bootstrap.css" t="Include" />
|
||||
<e p="bootstrap.css.map" t="Include" />
|
||||
<e p="bootstrap.min.css" t="Include" />
|
||||
<e p="bootstrap.min.css.map" t="Include" />
|
||||
</e>
|
||||
<e p="js" t="Include">
|
||||
<e p="bootstrap.bundle.js" t="Include" />
|
||||
<e p="bootstrap.bundle.js.map" t="Include" />
|
||||
<e p="bootstrap.bundle.min.js" t="Include" />
|
||||
<e p="bootstrap.bundle.min.js.map" t="Include" />
|
||||
<e p="bootstrap.js" t="Include" />
|
||||
<e p="bootstrap.js.map" t="Include" />
|
||||
<e p="bootstrap.min.js" t="Include" />
|
||||
<e p="bootstrap.min.js.map" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
<e p="LICENSE" t="Include" />
|
||||
</e>
|
||||
<e p="jquery" t="Include">
|
||||
<e p="dist" t="Include">
|
||||
<e p="jquery.js" t="Include" />
|
||||
<e p="jquery.min.js" t="Include" />
|
||||
<e p="jquery.min.map" t="Include" />
|
||||
</e>
|
||||
<e p="LICENSE.txt" t="Include" />
|
||||
</e>
|
||||
<e p="jquery-validation" t="Include">
|
||||
<e p="dist" t="Include">
|
||||
<e p="additional-methods.js" t="Include" />
|
||||
<e p="additional-methods.min.js" t="Include" />
|
||||
<e p="jquery.validate.js" t="Include" />
|
||||
<e p="jquery.validate.min.js" t="Include" />
|
||||
</e>
|
||||
<e p="LICENSE.md" t="Include" />
|
||||
</e>
|
||||
<e p="jquery-validation-unobtrusive" t="Include">
|
||||
<e p="jquery.validate.unobtrusive.js" t="Include" />
|
||||
<e p="jquery.validate.unobtrusive.min.js" t="Include" />
|
||||
<e p="LICENSE.txt" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
<e p="webfonts" t="Include">
|
||||
<e p="fa-brands-400.eot" t="Include" />
|
||||
<e p="fa-brands-400.svg" t="Include" />
|
||||
<e p="fa-brands-400.ttf" t="Include" />
|
||||
<e p="fa-brands-400.woff" t="Include" />
|
||||
<e p="fa-brands-400.woff2" t="Include" />
|
||||
<e p="fa-duotone-900.eot" t="Include" />
|
||||
<e p="fa-duotone-900.svg" t="Include" />
|
||||
<e p="fa-duotone-900.ttf" t="Include" />
|
||||
<e p="fa-duotone-900.woff" t="Include" />
|
||||
<e p="fa-duotone-900.woff2" t="Include" />
|
||||
<e p="fa-light-300.eot" t="Include" />
|
||||
<e p="fa-light-300.svg" t="Include" />
|
||||
<e p="fa-light-300.ttf" t="Include" />
|
||||
<e p="fa-light-300.woff" t="Include" />
|
||||
<e p="fa-light-300.woff2" t="Include" />
|
||||
<e p="fa-regular-400.eot" t="Include" />
|
||||
<e p="fa-regular-400.svg" t="Include" />
|
||||
<e p="fa-regular-400.ttf" t="Include" />
|
||||
<e p="fa-regular-400.woff" t="Include" />
|
||||
<e p="fa-regular-400.woff2" t="Include" />
|
||||
<e p="fa-solid-900.eot" t="Include" />
|
||||
<e p="fa-solid-900.svg" t="Include" />
|
||||
<e p="fa-solid-900.ttf" t="Include" />
|
||||
<e p="fa-solid-900.woff" t="Include" />
|
||||
<e p="fa-solid-900.woff2" t="Include" />
|
||||
</e>
|
||||
</e>
|
||||
</e>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,4 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
|
||||
</project>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ContentModelUserStore">
|
||||
<attachedFolders />
|
||||
<explicitIncludes />
|
||||
<explicitExcludes />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="JavaScriptLibraryMappings">
|
||||
<file url="PROJECT" libraries="{all, c1a632a160}" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="ProjectModuleManager">
|
||||
<modules>
|
||||
<module fileurl="file://$PROJECT_DIR$/.idea/.idea.c3stream/riderModule.iml" filepath="$PROJECT_DIR$/.idea/.idea.c3stream/riderModule.iml" />
|
||||
</modules>
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="RiderProjectSettingsUpdater">
|
||||
<option name="vcsConfiguration" value="1" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<module type="RIDER_MODULE" version="4">
|
||||
<component name="NewModuleRootManager">
|
||||
<content url="file://$MODULE_DIR$/../.." />
|
||||
<orderEntry type="sourceFolder" forTests="false" />
|
||||
<orderEntry type="library" name="c1a632a160" level="application" />
|
||||
<orderEntry type="library" name="all" level="application" />
|
||||
</component>
|
||||
</module>
|
||||
35
DataModels/Database.cs
Normal file
35
DataModels/Database.cs
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using c3stream.DataModels.Tables;
|
||||
using LinqToDB;
|
||||
using LinqToDB.Configuration;
|
||||
using LinqToDB.Data;
|
||||
|
||||
namespace c3stream.DataModels;
|
||||
|
||||
public class Database {
|
||||
public class ConnectionStringSettings : IConnectionStringSettings {
|
||||
public string ConnectionString { get; set; }
|
||||
public string Name { get; set; }
|
||||
public string ProviderName { get; set; }
|
||||
public bool IsGlobal => false;
|
||||
}
|
||||
|
||||
public class Settings : ILinqToDBSettings {
|
||||
public IEnumerable<IDataProviderSettings> DataProviders => Enumerable.Empty<IDataProviderSettings>();
|
||||
|
||||
public string DefaultConfiguration => "SQLite";
|
||||
public string DefaultDataProvider => "SQLite";
|
||||
|
||||
public IEnumerable<IConnectionStringSettings> ConnectionStrings {
|
||||
get { yield return new ConnectionStringSettings { Name = "db", ProviderName = "SQLite", ConnectionString = @"Data Source=data/c3stream.sqlite;" }; }
|
||||
}
|
||||
}
|
||||
|
||||
public class DbConn : DataConnection {
|
||||
public DbConn() : base("db") { }
|
||||
|
||||
public ITable<States> States => GetTable<States>();
|
||||
public ITable<DbInfo> DbInfo => GetTable<DbInfo>();
|
||||
}
|
||||
}
|
||||
9
DataModels/Tables/DbInfo.cs
Normal file
9
DataModels/Tables/DbInfo.cs
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
using LinqToDB.Mapping;
|
||||
|
||||
namespace c3stream.DataModels.Tables;
|
||||
|
||||
[Table(Name = "DbInfo")]
|
||||
public class DbInfo {
|
||||
[Column(Name = "ID"), PrimaryKey, Identity, NotNull] public int Id { get; set; }
|
||||
[Column(Name = "DbVer"), NotNull] public int DbVer { get; set; }
|
||||
}
|
||||
10
DataModels/Tables/States.cs
Normal file
10
DataModels/Tables/States.cs
Normal file
|
|
@ -0,0 +1,10 @@
|
|||
using LinqToDB.Mapping;
|
||||
|
||||
namespace c3stream.DataModels.Tables;
|
||||
|
||||
[Table(Name = "States")]
|
||||
public class States {
|
||||
[Column(Name = "TalkId"), PrimaryKey, NotNull] public string TalkId { get; set; }
|
||||
[Column(Name = "UserId"), PrimaryKey, NotNull] public string UserId { get; set; }
|
||||
[Column(Name = "State"), NotNull] public string State { get; set; }
|
||||
}
|
||||
5
LICENSE
5
LICENSE
|
|
@ -1,4 +1,4 @@
|
|||
MIT License
|
||||
Be Gay, Do Crimes License
|
||||
|
||||
Copyright (c) 2020 Laura Hausmann
|
||||
|
||||
|
|
@ -9,6 +9,9 @@ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|||
copies of the Software, and to permit persons to whom the Software is
|
||||
furnished to do so, subject to the following conditions:
|
||||
|
||||
Be Gay
|
||||
Do Crimes
|
||||
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
|
|
|
|||
90
Migrations.cs
Normal file
90
Migrations.cs
Normal file
|
|
@ -0,0 +1,90 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using c3stream.DataModels;
|
||||
using c3stream.DataModels.Tables;
|
||||
using LinqToDB;
|
||||
using LinqToDB.Data;
|
||||
|
||||
namespace c3stream;
|
||||
|
||||
public static class Migrations {
|
||||
private const int DbVer = 0;
|
||||
|
||||
private static readonly List<Migration> _migrations = new();
|
||||
|
||||
public static void RunMigrations() {
|
||||
using var db = new Database.DbConn();
|
||||
var ccolor = Console.ForegroundColor;
|
||||
|
||||
if (!db.DataProvider.GetSchemaProvider().GetSchema(db).Tables.Any()) {
|
||||
Console.ForegroundColor = ConsoleColor.DarkCyan;
|
||||
Console.Write("Running migration: ");
|
||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine("Initialize Database");
|
||||
|
||||
db.CreateTable<States>();
|
||||
db.CreateTable<DbInfo>();
|
||||
db.InsertWithIdentity(new DbInfo { DbVer = DbVer });
|
||||
}
|
||||
else if (db.DataProvider.GetSchemaProvider().GetSchema(db).Tables.All(t => t.TableName != "DbInfo")) {
|
||||
db.CreateTable<DbInfo>();
|
||||
db.InsertWithIdentity(new DbInfo { DbVer = 0 });
|
||||
}
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine($"Database version: {db.DbInfo.ToList().First().DbVer}");
|
||||
|
||||
var migrationsToRun = _migrations.FindAll(p => p.IntroducedWithDbVer > db.DbInfo.First().DbVer);
|
||||
if (migrationsToRun.Count == 0) {
|
||||
Console.ForegroundColor = ConsoleColor.Green;
|
||||
Console.WriteLine("No migrations to run.");
|
||||
}
|
||||
else {
|
||||
new Migration(0, "BEGIN TRANSACTION").Run(db);
|
||||
try {
|
||||
migrationsToRun.ForEach(p => p.Run(db));
|
||||
}
|
||||
catch {
|
||||
Console.ForegroundColor = ConsoleColor.DarkRed;
|
||||
Console.WriteLine($"Migrating to database version {DbVer} failed.");
|
||||
new Migration(0, "ROLLBACK TRANSACTION").Run(db);
|
||||
Console.ForegroundColor = ConsoleColor.DarkYellow;
|
||||
Console.WriteLine("Rolled back migrations.");
|
||||
Environment.Exit(1);
|
||||
}
|
||||
|
||||
new Migration(0, "COMMIT TRANSACTION").Run(db);
|
||||
|
||||
var newdb = new Database.DbConn();
|
||||
var dbinfo = newdb.DbInfo.First();
|
||||
dbinfo.DbVer = DbVer;
|
||||
newdb.Update(dbinfo);
|
||||
|
||||
Console.ForegroundColor = ConsoleColor.DarkGreen;
|
||||
Console.WriteLine($"Database version is now: {DbVer}");
|
||||
Console.ForegroundColor = ConsoleColor.Green;
|
||||
Console.WriteLine("Finished running migrations.");
|
||||
}
|
||||
|
||||
Console.ForegroundColor = ccolor;
|
||||
}
|
||||
|
||||
private class Migration {
|
||||
private readonly string _sql;
|
||||
public readonly int IntroducedWithDbVer;
|
||||
|
||||
public Migration(int introducedWithDbVer, string sql) {
|
||||
IntroducedWithDbVer = introducedWithDbVer;
|
||||
_sql = sql;
|
||||
}
|
||||
|
||||
public void Run(DataConnection db) {
|
||||
Console.ForegroundColor = ConsoleColor.DarkCyan;
|
||||
Console.Write("Running migration: ");
|
||||
Console.ForegroundColor = ConsoleColor.Yellow;
|
||||
Console.WriteLine(_sql);
|
||||
db.Execute(_sql);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,33 +1,20 @@
|
|||
@page
|
||||
@using global::c3stream.DataModels
|
||||
@model ConferenceModel
|
||||
@using System.Net
|
||||
@using static ConferenceModel
|
||||
@{
|
||||
int tagFormat;
|
||||
switch (Request.Query["c"]) {
|
||||
case "36c3":
|
||||
tagFormat = 2;
|
||||
break;
|
||||
case "35c3":
|
||||
case "34c3":
|
||||
tagFormat = 1;
|
||||
break;
|
||||
case "33c3":
|
||||
tagFormat = 0;
|
||||
break;
|
||||
default:
|
||||
if (c3stream.Conferences.All(c => c.Acronym != Request.Query["c"])) {
|
||||
Response.Redirect("/");
|
||||
return;
|
||||
}
|
||||
|
||||
c3stream.UpdateCookie(Request, Response, $"/Conference?c={Request.Query["c"]}&");
|
||||
|
||||
var cookie = c3stream.UpdateCookie(Request, Response, $"/Conference?c={Request.Query["c"]}");
|
||||
ViewData["Title"] = Request.Query["c"];
|
||||
var wc = new WebClient();
|
||||
var jsonpath = System.IO.Path.Combine(c3stream.DataPath, Request.Query["c"] + ".json");
|
||||
var json = System.IO.File.Exists(jsonpath) ? System.IO.File.ReadAllText(jsonpath) : wc.DownloadString($"https://api.media.ccc.de/public/conferences/{Request.Query["c"]}");
|
||||
var conference = Conference.FromJson(json);
|
||||
wc.Dispose();
|
||||
var conference = c3stream.Conferences.First(c => c.Acronym == Request.Query["c"]);
|
||||
if (conference.Ongoing) {
|
||||
c3stream.UpdateConference(conference);
|
||||
}
|
||||
await using var db = new Database.DbConn();
|
||||
var states = db.States.ToList();
|
||||
}
|
||||
|
||||
<table class="table">
|
||||
|
|
@ -35,7 +22,8 @@
|
|||
<tr>
|
||||
<th scope="col">Event</th>
|
||||
<th scope="col">
|
||||
@Html.Raw(Request.Query["orderby"] == "published" ? $"<a href=\"/Conference?c={Request.Query["c"]}&bookmark={Request.Query["bookmark"]}\">Published" : $"<a href=\"/Conference?c={Request.Query["c"]}&bookmark={Request.Query["bookmark"]}&orderby=published\">Date")</th>
|
||||
@Html.Raw(Request.Query["orderby"] == "published" ? $"<a href=\"/Conference?c={Request.Query["c"]}\">Published" : $"<a href=\"/Conference?c={Request.Query["c"]}&orderby=published\">Date")
|
||||
</th>
|
||||
<th scope="col">Category</th>
|
||||
<th scope="col">Title</th>
|
||||
<th scope="col">Speaker(s)</th>
|
||||
|
|
@ -44,79 +32,77 @@
|
|||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var talk in Request.Query["orderby"] == "published" ? conference.Events.OrderByDescending(p => p.ReleaseDate) : conference.Events.OrderBy(p => p.Date)) {
|
||||
TalkMetadata metadata;
|
||||
if (EventMetadata.Any(p => p.Guid == talk.Guid?.ToString())) {
|
||||
metadata = EventMetadata.First(p => p.Guid == talk.Guid?.ToString());
|
||||
}
|
||||
else {
|
||||
metadata = GetEvent(talk.Guid?.ToString());
|
||||
EventMetadata.Add(metadata);
|
||||
}
|
||||
var isWatched = EventMetadata.Any(p => p.Guid == talk.Guid?.ToString() && p.State.FirstOrDefault(q => q.Guid == Request.Cookies["bookmark"])?.State == "watched");
|
||||
var isMarked = EventMetadata.Any(p => p.Guid == talk.Guid?.ToString() && p.State.FirstOrDefault(q => q.Guid == Request.Cookies["bookmark"])?.State == "marked");
|
||||
var file = metadata.Talk.Recordings.FirstOrDefault(p => System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, conference.Acronym, p.Filename)));
|
||||
var eventName = tagFormat == 0 ? conference.Acronym : talk.Tags[0].Replace("-", "-<br/>");
|
||||
var category = tagFormat switch {
|
||||
0 => talk.Tags[0],
|
||||
1 => talk.Tags[2],
|
||||
2 => talk.Tags[3],
|
||||
_ => ""
|
||||
@foreach (var talk in Request.Query["orderby"] == "published" ? conference.Talks.OrderByDescending(p => p.ReleaseDate) : conference.Talks.OrderBy(p => p.Date)) {
|
||||
var state = states.FirstOrDefault(p => p.TalkId == talk.Guid && p.UserId == cookie)?.State;
|
||||
var isWatched = state == "watched";
|
||||
var isMarked = state == "marked";
|
||||
var file = $"{talk.Slug}.mp4";
|
||||
var eventName = talk.Tags.Count <= 1 ? conference.Acronym : talk.Tags[0].Replace("-", "-<br/>");
|
||||
var category = talk.Tags.Count switch {
|
||||
0 => "<no category>",
|
||||
1 => talk.Tags[0],
|
||||
2 => "<no category>",
|
||||
3 => talk.Tags[2],
|
||||
4 => talk.Tags[3],
|
||||
5 => talk.Tags[3],
|
||||
6 => talk.Tags[3],
|
||||
7 => talk.Tags[3],
|
||||
_ => "<unknown tag format>"
|
||||
};
|
||||
<tr>
|
||||
<td>@Html.Raw(eventName)</td>
|
||||
<td>@(Request.Query["orderby"] == "published" ? talk.ReleaseDate?.Date.ToShortDateString() : talk.Date?.Date.ToShortDateString())</td>
|
||||
<td class="text-nowrap">@(Request.Query["orderby"] == "published" ? talk.ReleaseDate?.Date.ToString("yyyy-MM-dd") : talk.Date?.Date.ToString("yyyy-MM-dd"))</td>
|
||||
<td>@category</td>
|
||||
@if (isWatched) {
|
||||
<td style="color: limegreen">@talk.Title</td>
|
||||
<td style="color: #95cb7a">@talk.Title</td>
|
||||
}
|
||||
else if (isMarked) {
|
||||
<td style="color: orangered">@talk.Title</td>
|
||||
<td style="color: #da7d4f">@talk.Title</td>
|
||||
}
|
||||
else {
|
||||
<td>@talk.Title</td>
|
||||
}
|
||||
<td>@talk.Persons.Aggregate((s, s1) => $"{s}, {s1}")</td>
|
||||
<td>@(talk.Persons.Any() ? talk.Persons.Aggregate((s, s1) => $"{s}, {s1}") : "<no speakers>")</td>
|
||||
<td>@talk.OriginalLanguage</td>
|
||||
<td>
|
||||
<div class="btn-group w-100" role="group">
|
||||
<a href="@talk.FrontendLink.AbsoluteUri" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Play">
|
||||
<div class="btn-group" role="group">
|
||||
<a href="@talk.FrontendLink.AbsoluteUri" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Play">
|
||||
<i class="fas fa-play-circle"></i>
|
||||
</a>
|
||||
@if (file != null) {
|
||||
<a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file.Filename}")" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Mirror">
|
||||
@if (System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, conference.Acronym, file))) {
|
||||
<a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mirror">
|
||||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
else {
|
||||
<a href="/" target="_blank" type="button" class="btn btn-primary disabled">
|
||||
<a href="/" role="button" class="btn btn-primary btn-c3saction disabled">
|
||||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
<a href="/Info?guid=@talk.Guid?.ToString()&bookmark=@Request.Query["bookmark"]" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Info">
|
||||
<a href="/Info?guid=@talk.Guid" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Info">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</a>
|
||||
@if (isWatched) {
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Mark unwatched">
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mark unwatched">
|
||||
<i class="fas fa-times"></i>
|
||||
</button>
|
||||
<button class="btn btn-primary disabled">
|
||||
<button class="btn btn-primary btn-c3saction disabled" disabled>
|
||||
<i class="fas fa-clock"></i>
|
||||
</button>
|
||||
}
|
||||
else if (isMarked) {
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Mark watched">
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mark watched">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Remove from watch later">
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Remove from watch later">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</button>
|
||||
}
|
||||
else {
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Mark watched">
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mark watched">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
<button onclick="SetState('@talk.Guid', 'marked')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="top" title="Add to watch later">
|
||||
<button onclick="SetState('@talk.Guid', 'marked')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Add to watch later">
|
||||
<i class="fas fa-clock"></i>
|
||||
</button>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,81 +1,37 @@
|
|||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using System.Net;
|
||||
using System.Linq;
|
||||
using c3stream.DataModels;
|
||||
using c3stream.DataModels.Tables;
|
||||
using LinqToDB;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
using Newtonsoft.Json;
|
||||
|
||||
namespace c3stream.Pages {
|
||||
public class ConferenceModel : PageModel {
|
||||
public static List<TalkMetadata> EventMetadata = new List<TalkMetadata>();
|
||||
namespace c3stream.Pages;
|
||||
|
||||
public class ConferenceModel : PageModel {
|
||||
private readonly ILogger<ConferenceModel> _logger;
|
||||
|
||||
public ConferenceModel(ILogger<ConferenceModel> logger) => _logger = logger;
|
||||
|
||||
public void OnGet() {
|
||||
var guid = Request.Query["guid"];
|
||||
var state = Request.Query["state"];
|
||||
var guid = Request.Query["guid"].ToString();
|
||||
var state = Request.Query["state"].ToString();
|
||||
var userid = Request.Cookies["bookmark"];
|
||||
if (string.IsNullOrWhiteSpace(guid) || string.IsNullOrWhiteSpace(state) || !Request.Cookies.ContainsKey("bookmark"))
|
||||
return;
|
||||
|
||||
lock (c3stream.Lock) {
|
||||
ReadEventMetadata();
|
||||
var existing = EventMetadata.FirstOrDefault(p => p.Guid == guid)?.State.FirstOrDefault(p => p.Guid == Request.Cookies["bookmark"]);
|
||||
using var db = new Database.DbConn();
|
||||
var existing = db.States.FirstOrDefault(p => p.TalkId == guid && p.UserId == userid);
|
||||
if (existing != null)
|
||||
if (state == "unwatched") {
|
||||
db.States.Delete(p => p == existing);
|
||||
}
|
||||
else {
|
||||
existing.State = state;
|
||||
db.Update(existing);
|
||||
}
|
||||
else
|
||||
EventMetadata.FirstOrDefault(p => p.Guid == guid)?.State.Add(new UserState(Request.Cookies["bookmark"], state));
|
||||
WriteEventMetadata();
|
||||
db.Insert(new States { State = state, TalkId = guid, UserId = userid });
|
||||
|
||||
Response.Redirect("/");
|
||||
}
|
||||
}
|
||||
|
||||
public static TalkMetadata GetEvent(string guid) {
|
||||
TalkMetadata metadata;
|
||||
lock (c3stream.Lock) {
|
||||
ReadEventMetadata();
|
||||
using (var wc = new WebClient()) {
|
||||
var json = wc.DownloadString($"https://api.media.ccc.de/public/events/{guid}");
|
||||
var talk = Talk.FromJson(json);
|
||||
metadata = new TalkMetadata(guid, talk);
|
||||
EventMetadata.Add(metadata);
|
||||
}
|
||||
|
||||
WriteEventMetadata();
|
||||
}
|
||||
|
||||
return metadata;
|
||||
}
|
||||
|
||||
public static void ReadEventMetadata() {
|
||||
lock (c3stream.Lock)
|
||||
EventMetadata = JsonConvert.DeserializeObject<List<TalkMetadata>>(System.IO.File.ReadAllText(c3stream.DbPath));
|
||||
}
|
||||
|
||||
public static void WriteEventMetadata() {
|
||||
System.IO.File.WriteAllText(c3stream.DbPath, JsonConvert.SerializeObject(EventMetadata));
|
||||
}
|
||||
|
||||
public class TalkMetadata {
|
||||
public readonly string Guid;
|
||||
public List<UserState> State;
|
||||
public Talk Talk;
|
||||
|
||||
public TalkMetadata(string guid, Talk talk) {
|
||||
Guid = guid;
|
||||
State = new List<UserState>();
|
||||
Talk = talk;
|
||||
}
|
||||
}
|
||||
|
||||
public class UserState {
|
||||
public string Guid;
|
||||
public string State;
|
||||
|
||||
public UserState(string guid, string state = "unwatched") {
|
||||
Guid = guid;
|
||||
State = state;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -3,9 +3,10 @@ using Microsoft.AspNetCore.Mvc;
|
|||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace c3stream.Pages {
|
||||
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
|
||||
public class ErrorModel : PageModel {
|
||||
namespace c3stream.Pages;
|
||||
|
||||
[ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
|
||||
public class ErrorModel : PageModel {
|
||||
private readonly ILogger<ErrorModel> _logger;
|
||||
|
||||
public ErrorModel(ILogger<ErrorModel> logger) => _logger = logger;
|
||||
|
|
@ -17,5 +18,4 @@ namespace c3stream.Pages {
|
|||
public void OnGet() {
|
||||
RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,18 +1,22 @@
|
|||
@page
|
||||
@using global::c3stream.DataModels
|
||||
@model IndexModel
|
||||
@{
|
||||
ViewData["Title"] = "Home";
|
||||
c3stream.UpdateCookie(Request, Response, $"/?");
|
||||
var cookie = c3stream.UpdateCookie(Request, Response, "/");
|
||||
var marked = new Database.DbConn().States.Any(p => p.UserId == cookie && p.State == "marked");
|
||||
}
|
||||
|
||||
<div style="text-align: center">
|
||||
<h1>Welcome to c3stream!</h1>
|
||||
Your bookmark link:<br/>
|
||||
<code onclick="copyToClipboard(this)">https://@Request.Host.Value?bookmark=@Request.Cookies["bookmark"]</code><br/><br/>
|
||||
<code onclick="copyToClipboard(this)">https://@Request.Host.Value?bookmark=@cookie</code><br/><br/>
|
||||
<div class="btn-group">
|
||||
<a type="button" class="btn btn-primary" href="/Conference?c=36c3&bookmark=@Request.Cookies["bookmark"]">36c3</a>
|
||||
<a type="button" class="btn btn-primary" href="/Conference?c=35c3&bookmark=@Request.Cookies["bookmark"]">35c3</a>
|
||||
<a type="button" class="btn btn-primary" href="/Conference?c=34c3&bookmark=@Request.Cookies["bookmark"]">34c3</a>
|
||||
<a type="button" class="btn btn-primary" href="/Conference?c=33c3&bookmark=@Request.Cookies["bookmark"]">33c3</a>
|
||||
@if (marked) {
|
||||
<a role="button" class="btn btn-primary" href="/Watchlist">watchlist</a>
|
||||
}
|
||||
@foreach (var conf in c3stream.Conferences) {
|
||||
<a role="button" class="btn btn-primary" href="/Conference?c=@conf.Acronym">@conf.Acronym</a>
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace c3stream.Pages {
|
||||
public class IndexModel : PageModel {
|
||||
namespace c3stream.Pages;
|
||||
|
||||
public class IndexModel : PageModel {
|
||||
private readonly ILogger<IndexModel> _logger;
|
||||
|
||||
public IndexModel(ILogger<IndexModel> logger) => _logger = logger;
|
||||
|
||||
public void OnGet() { }
|
||||
}
|
||||
}
|
||||
|
|
@ -1,105 +1,115 @@
|
|||
@page
|
||||
@using global::c3stream.DataModels
|
||||
@using System.Net.Http
|
||||
@using System.Net
|
||||
@using System.IO
|
||||
@model InfoModel
|
||||
@{
|
||||
ViewData["Title"] = "Info";
|
||||
}
|
||||
@{
|
||||
if (string.IsNullOrWhiteSpace(Request.Query["guid"])) {
|
||||
if (string.IsNullOrWhiteSpace(Request.Query["guid"]) || c3stream.GetEventByGuid(Request.Query["guid"]) == null) {
|
||||
Response.Redirect("/");
|
||||
return;
|
||||
}
|
||||
|
||||
c3stream.UpdateCookie(Request, Response, $"/Info?guid={Request.Query["guid"]}&");
|
||||
var cookie = c3stream.UpdateCookie(Request, Response, $"/Info?guid={Request.Query["guid"]}");
|
||||
|
||||
ConferenceModel.ReadEventMetadata();
|
||||
var talk = ConferenceModel.EventMetadata.FirstOrDefault(p => p.Guid == Request.Query["guid"]);
|
||||
await using var db = new Database.DbConn();
|
||||
|
||||
var talk = c3stream.GetEventByGuid(Request.Query["guid"]);
|
||||
var state = db.States.FirstOrDefault(p => p.TalkId == Request.Query["guid"].ToString() && p.UserId == cookie)?.State;
|
||||
if (talk == null) {
|
||||
Response.Redirect("/");
|
||||
return;
|
||||
}
|
||||
if (state == null) {
|
||||
state = "unwatched";
|
||||
}
|
||||
|
||||
var title = talk.Talk.Title;
|
||||
var speakers = talk.Talk.Persons.Aggregate((s, s1) => $"{s}, {s1}");
|
||||
var description = talk.Talk.Description;
|
||||
var title = talk.Title;
|
||||
var speakers = talk.Persons.Any() ? talk.Persons.Aggregate((s, s1) => $"{s}, {s1}") : "<no speakers>";
|
||||
var description = talk.Description;
|
||||
if (string.IsNullOrEmpty(description)) {
|
||||
description = "<missing description>";
|
||||
}
|
||||
|
||||
var isWatched = talk.State.FirstOrDefault(q => q.Guid == Request.Cookies["bookmark"])?.State == "watched";
|
||||
var isMarked = talk.State.FirstOrDefault(q => q.Guid == Request.Cookies["bookmark"])?.State == "marked";
|
||||
var file = talk.Talk.Recordings.FirstOrDefault(p => System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, talk.Talk.ConferenceUrl.AbsoluteUri.Split("/").Last(), p.Filename)));
|
||||
var eventName = talk.Talk.Tags[0].Replace("-", "-<br/>");
|
||||
var isWatched = state == "watched";
|
||||
var isMarked = state == "marked";
|
||||
var file = $"{talk.Slug}.mp4";
|
||||
var conference = c3stream.GetConferenceByEventGuid(talk.Guid);
|
||||
|
||||
int tagFormat;
|
||||
switch (talk.Talk.ConferenceUrl.AbsoluteUri.Split("/").Last()) {
|
||||
case "36c3":
|
||||
tagFormat = 2;
|
||||
break;
|
||||
case "35c3":
|
||||
case "34c3":
|
||||
tagFormat = 1;
|
||||
break;
|
||||
case "33c3":
|
||||
tagFormat = 0;
|
||||
break;
|
||||
default:
|
||||
Response.Redirect("/");
|
||||
return;
|
||||
}
|
||||
var eventName = talk.Tags.Count <= 1 ? conference.Acronym : talk.Tags[0];
|
||||
var logoPath = System.IO.Path.Combine(c3stream.LogoPath, conference.Acronym + ".png");
|
||||
|
||||
var category = tagFormat switch {
|
||||
0 => talk.Talk.Tags[0],
|
||||
1 => talk.Talk.Tags[2],
|
||||
2 => talk.Talk.Tags[3],
|
||||
_ => ""
|
||||
var category = talk.Tags.Count switch {
|
||||
0 => "<no category>",
|
||||
1 => talk.Tags[0],
|
||||
2 => "<no category>",
|
||||
3 => talk.Tags[2],
|
||||
4 => talk.Tags[3],
|
||||
5 => talk.Tags[3],
|
||||
6 => talk.Tags[3],
|
||||
7 => talk.Tags[3],
|
||||
_ => "<unknown tag format>"
|
||||
};
|
||||
}
|
||||
|
||||
@if (!System.IO.File.Exists(logoPath)) {
|
||||
using var httpClient = new HttpClient();
|
||||
await using var stream = httpClient.GetStreamAsync(conference.LogoUri).Result;
|
||||
await using var fileStream = new FileStream(logoPath, FileMode.CreateNew);
|
||||
await stream.CopyToAsync(fileStream);
|
||||
}
|
||||
|
||||
<img src="@(c3stream.LogoUrl + $"{conference.Acronym}.png")" alt="Conference logo" style="max-height: 110px; float: right;"/>
|
||||
|
||||
@if (isWatched) {
|
||||
<h3 style="color: limegreen">@title - <i>@speakers</i></h3>
|
||||
<h3 style="color: #95cb7a">@title - <i>@speakers</i></h3>
|
||||
}
|
||||
else if (isMarked) {
|
||||
<h3 style="color: orangered">@title - <i>@speakers</i></h3>
|
||||
<h3 style="color: #da7d4f">@title - <i>@speakers</i></h3>
|
||||
}
|
||||
else {
|
||||
<h3>@title - <i>@speakers</i></h3>
|
||||
}
|
||||
|
||||
<h5>@eventName - @category - @talk.Date?.Date.ToShortDateString()</h5>
|
||||
<div class="btn-group" role="group" style="margin-bottom: 10px">
|
||||
<a href="@talk.Talk.FrontendLink.AbsoluteUri" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="right" title="Play">
|
||||
<a href="@talk.FrontendLink.AbsoluteUri" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="right" title="Play">
|
||||
<i class="fas fa-play-circle"></i>
|
||||
</a>
|
||||
@if (file != null) {
|
||||
<a href="@(c3stream.CacheUrl + $"{talk.Talk.ConferenceUrl.AbsoluteUri.Split("/").Last()}/{file.Filename}")" target="_blank" type="button" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="right" title="Mirror">
|
||||
@if (System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, conference.Acronym, file))) {
|
||||
<a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="right" title="Mirror">
|
||||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
else {
|
||||
<a href="/" target="_blank" type="button" class="btn btn-primary disabled">
|
||||
<a href="/" role="button" class="btn btn-primary btn-c3saction disabled">
|
||||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
@if (isWatched) {
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="left" title="Mark unwatched">
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="left" title="Mark unwatched">
|
||||
<i class="fas fa-times"></i>
|
||||
</button>
|
||||
<button class="btn btn-primary disabled">
|
||||
<button class="btn btn-primary btn-c3saction disabled">
|
||||
<i class="fas fa-clock"></i>
|
||||
</button>
|
||||
}
|
||||
else if (isMarked) {
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="left" title="Mark watched">
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="left" title="Mark watched">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="left" title="Remove from watch later">
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="left" title="Remove from watch later">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</button>
|
||||
}
|
||||
else {
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="left" title="Mark watched">
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="left" title="Mark watched">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
<button onclick="SetState('@talk.Guid', 'marked')" class="btn btn-primary w-100" data-toggle="tooltip" data-placement="left" title="Add to watch later">
|
||||
<button onclick="SetState('@talk.Guid', 'marked')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="left" title="Add to watch later">
|
||||
<i class="fas fa-clock"></i>
|
||||
</button>
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace c3stream.Pages {
|
||||
public class InfoModel : PageModel {
|
||||
namespace c3stream.Pages;
|
||||
|
||||
public class InfoModel : PageModel {
|
||||
private readonly ILogger<InfoModel> _logger;
|
||||
|
||||
public InfoModel(ILogger<InfoModel> logger) => _logger = logger;
|
||||
|
||||
public void OnGet() { }
|
||||
}
|
||||
}
|
||||
|
|
@ -3,9 +3,26 @@
|
|||
@{
|
||||
ViewData["Title"] = "Privacy";
|
||||
}
|
||||
<h3>Privacy</h3>
|
||||
<h3>Privacy Policy</h3>
|
||||
<p style="text-align: justify">
|
||||
All data saved about you on this website is the watched status of talks you marked in association with your randomly generated bookmark UUID.
|
||||
No logs are kept, no trackers used. Keep in mind that you are forwarded to media.ccc.de if you choose to open a talk, and have checked their respective privacy policy as well. <br/>
|
||||
Have fun!
|
||||
Last update: 2022-12-15 <br/><br/>
|
||||
All data saved about you on this website is the watched status of talks you marked in association with your randomly generated bookmark UUID. <br/>
|
||||
No unnecessary logs are kept, no trackers used. <br/>
|
||||
</p>
|
||||
|
||||
<p>Web server access logs are enabled for statistical purposes only. The following data is collected and kept in anonymized form for a maximum of 28 days:</p>
|
||||
<ul>
|
||||
<li>Request date & time</li>
|
||||
<li>Anonymized IP address (first 48 bits of the IPv6 address, IPv4 addresses go through a NAT46 gateway and are not logged)</li>
|
||||
<li>Request type, URL and protocol</li>
|
||||
<li>HTTP response code</li>
|
||||
<li>Response body size</li>
|
||||
<li>Referer</li>
|
||||
<li>User agent</li>
|
||||
<li>Response time</li>
|
||||
</ul>
|
||||
|
||||
<p style="text-align: justify">
|
||||
Keep in mind that you are forwarded to media.ccc.de when you watch a talk (except when using our mirror). <br/>
|
||||
You should therefore reference their privacy policy as well. <br/>
|
||||
</p>
|
||||
|
|
@ -1,12 +1,12 @@
|
|||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace c3stream.Pages {
|
||||
public class PrivacyModel : PageModel {
|
||||
namespace c3stream.Pages;
|
||||
|
||||
public class PrivacyModel : PageModel {
|
||||
private readonly ILogger<PrivacyModel> _logger;
|
||||
|
||||
public PrivacyModel(ILogger<PrivacyModel> logger) => _logger = logger;
|
||||
|
||||
public void OnGet() { }
|
||||
}
|
||||
}
|
||||
|
|
@ -12,8 +12,8 @@
|
|||
<header>
|
||||
<nav class="navbar navbar-expand-sm navbar-toggleable-sm navbar-light bg-white border-bottom box-shadow mb-3">
|
||||
<div class="container-fluid" style="width: 90%">
|
||||
<a class="navbar-brand" asp-area="" asp-page="/Index">c3stream</a>
|
||||
<button class="navbar-toggler" type="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
|
||||
<a class="navbar-brand" asp-area="" asp-page="/Index">c3stream <small style="font-size: x-small">v5</small></a>
|
||||
<button class="navbar-toggler" role="button" data-toggle="collapse" data-target=".navbar-collapse" aria-controls="navbarSupportedContent"
|
||||
aria-expanded="false" aria-label="Toggle navigation">
|
||||
<span class="navbar-toggler-icon"></span>
|
||||
</button>
|
||||
|
|
@ -26,10 +26,12 @@
|
|||
</main>
|
||||
</div>
|
||||
|
||||
<footer class="border-top footer text-muted">
|
||||
<footer class="border-top footer">
|
||||
<div class="container-fluid" style="width: 90%; text-align: center">
|
||||
© 2020 - c3stream - <a href="/Privacy">Privacy</a> -
|
||||
c3stream is not associated with media.ccc.de in any way and is just providing an easy way to store watched talks.
|
||||
<a href="/Privacy">Privacy</a> -
|
||||
<a href="mailto:c3stream-contact@zotan.email">Contact</a> -
|
||||
<a href="https://git.zotan.services/zotan/c3stream/">Source Code</a> -
|
||||
c3stream is not affiliated with media.ccc.de in any way. Mirrored video files display their license in the video, no rights reserved.
|
||||
</div>
|
||||
</footer>
|
||||
|
||||
|
|
|
|||
110
Pages/Watchlist.cshtml
Normal file
110
Pages/Watchlist.cshtml
Normal file
|
|
@ -0,0 +1,110 @@
|
|||
@page
|
||||
@using global::c3stream.DataModels
|
||||
@model WatchlistModel
|
||||
@{
|
||||
var cookie = c3stream.UpdateCookie(Request, Response, "/Watchlist");
|
||||
ViewData["Title"] = "Watchlist";
|
||||
await using var db = new Database.DbConn();
|
||||
var states = db.States.ToList();
|
||||
var marked = db.States.Where(p => p.UserId == cookie && p.State == "marked").Select(p => p.TalkId).ToList();
|
||||
var watchlist = c3stream.GetEventsByGuid(marked);
|
||||
}
|
||||
|
||||
<table class="table">
|
||||
<thead>
|
||||
<tr>
|
||||
<th scope="col">Conference</th>
|
||||
<th scope="col">Event</th>
|
||||
<th scope="col">
|
||||
@Html.Raw(Request.Query["orderby"] == "published" ? "<a href=\"/Watchlist\">Published" : "<a href=\"/Watchlist?orderby=published\">Date")
|
||||
</th>
|
||||
<th scope="col">Category</th>
|
||||
<th scope="col">Title</th>
|
||||
<th scope="col">Speaker(s)</th>
|
||||
<th scope="col">Lang</th>
|
||||
<th scope="col">Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@foreach (var talk in Request.Query["orderby"] == "published" ? watchlist.OrderByDescending(p => p.ReleaseDate) : watchlist.OrderBy(p => p.Date)) {
|
||||
var state = states.FirstOrDefault(p => p.TalkId == talk.Guid && p.UserId == cookie)?.State;
|
||||
var isWatched = state == "watched";
|
||||
var isMarked = state == "marked";
|
||||
var file = $"{talk.Slug}.mp4";
|
||||
var conference = c3stream.GetConferenceByEventGuid(talk.Guid);
|
||||
var eventName = talk.Tags.Count <= 1 ? conference.Acronym : talk.Tags[0].Replace("-", "-<br/>");
|
||||
var category = talk.Tags.Count switch {
|
||||
0 => "<no category>",
|
||||
1 => talk.Tags[0],
|
||||
2 => "<no category>",
|
||||
3 => talk.Tags[2],
|
||||
4 => talk.Tags[3],
|
||||
5 => talk.Tags[3],
|
||||
6 => talk.Tags[3],
|
||||
7 => talk.Tags[3],
|
||||
_ => "<unknown tag format>"
|
||||
};
|
||||
<tr>
|
||||
<td>@Html.Raw(conference.Acronym)</td>
|
||||
<td>@Html.Raw(eventName)</td>
|
||||
<td>@(Request.Query["orderby"] == "published" ? talk.ReleaseDate?.Date.ToShortDateString() : talk.Date?.Date.ToShortDateString())</td>
|
||||
<td>@category</td>
|
||||
@if (isWatched) {
|
||||
<td style="color: #95cb7a">@talk.Title</td>
|
||||
}
|
||||
else if (isMarked) {
|
||||
<td style="color: #da7d4f">@talk.Title</td>
|
||||
}
|
||||
else {
|
||||
<td>@talk.Title</td>
|
||||
}
|
||||
<td>@(talk.Persons.Any() ? talk.Persons.Aggregate((s, s1) => $"{s}, {s1}") : "<no speakers>")</td>
|
||||
<td>@talk.OriginalLanguage</td>
|
||||
<td>
|
||||
<div class="btn-group" role="group">
|
||||
<a href="@talk.FrontendLink.AbsoluteUri" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Play">
|
||||
<i class="fas fa-play-circle"></i>
|
||||
</a>
|
||||
@if (System.IO.File.Exists(System.IO.Path.Combine(c3stream.CachePath, conference.Acronym, file))) {
|
||||
<a href="@(c3stream.CacheUrl + $"{conference.Acronym}/{file}")" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mirror">
|
||||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
else {
|
||||
<a href="/" role="button" class="btn btn-primary btn-c3saction disabled">
|
||||
<i class="fas fa-cloud-download"></i>
|
||||
</a>
|
||||
}
|
||||
<a href="/Info?guid=@talk.Guid" role="button" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Info">
|
||||
<i class="fas fa-info-circle"></i>
|
||||
</a>
|
||||
@if (isWatched) {
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mark unwatched">
|
||||
<i class="fas fa-times"></i>
|
||||
</button>
|
||||
<button class="btn btn-primary btn-c3saction disabled">
|
||||
<i class="fas fa-clock"></i>
|
||||
</button>
|
||||
}
|
||||
else if (isMarked) {
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mark watched">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
<button onclick="SetState('@talk.Guid', 'unwatched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Remove from watch later">
|
||||
<i class="fas fa-undo-alt"></i>
|
||||
</button>
|
||||
}
|
||||
else {
|
||||
<button onclick="SetState('@talk.Guid', 'watched')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Mark watched">
|
||||
<i class="fas fa-check"></i>
|
||||
</button>
|
||||
<button onclick="SetState('@talk.Guid', 'marked')" class="btn btn-primary btn-c3saction w-100" data-toggle="tooltip" data-placement="top" title="Add to watch later">
|
||||
<i class="fas fa-clock"></i>
|
||||
</button>
|
||||
}
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
}
|
||||
</tbody>
|
||||
</table>
|
||||
37
Pages/Watchlist.cshtml.cs
Normal file
37
Pages/Watchlist.cshtml.cs
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
using System.Linq;
|
||||
using c3stream.DataModels;
|
||||
using c3stream.DataModels.Tables;
|
||||
using LinqToDB;
|
||||
using Microsoft.AspNetCore.Mvc.RazorPages;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
namespace c3stream.Pages;
|
||||
|
||||
public class WatchlistModel : PageModel {
|
||||
private readonly ILogger<ConferenceModel> _logger;
|
||||
|
||||
public WatchlistModel(ILogger<ConferenceModel> logger) => _logger = logger;
|
||||
|
||||
public void OnGet() {
|
||||
var guid = Request.Query["guid"].ToString();
|
||||
var state = Request.Query["state"].ToString();
|
||||
var userid = Request.Cookies["bookmark"];
|
||||
if (string.IsNullOrWhiteSpace(guid) || string.IsNullOrWhiteSpace(state) || !Request.Cookies.ContainsKey("bookmark"))
|
||||
return;
|
||||
|
||||
using var db = new Database.DbConn();
|
||||
var existing = db.States.FirstOrDefault(p => p.TalkId == guid && p.UserId == userid);
|
||||
if (existing != null)
|
||||
if (state == "unwatched") {
|
||||
db.States.Delete(p => p == existing);
|
||||
}
|
||||
else {
|
||||
existing.State = state;
|
||||
db.Update(existing);
|
||||
}
|
||||
else
|
||||
db.Insert(new States { State = state, TalkId = guid, UserId = userid });
|
||||
|
||||
Response.Redirect("/");
|
||||
}
|
||||
}
|
||||
|
|
@ -1,12 +1,4 @@
|
|||
{
|
||||
"iisSettings": {
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:37898",
|
||||
"sslPort": 44314
|
||||
}
|
||||
},
|
||||
"profiles": {
|
||||
"c3stream": {
|
||||
"commandName": "Project",
|
||||
|
|
|
|||
|
|
@ -1 +1,2 @@
|
|||
c3stream is a small proxy site meant for saving watched status & watch-later-lists for media.ccc.de talks. Test in production at https://c3stream.de
|
||||
c3stream is a small proxy site meant for saving watched status & watch-later-lists for media.ccc.de talks. Test in
|
||||
production at https://c3stream.de
|
||||
|
|
@ -4,8 +4,9 @@ using Microsoft.Extensions.Configuration;
|
|||
using Microsoft.Extensions.DependencyInjection;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace c3stream {
|
||||
public class Startup {
|
||||
namespace c3stream;
|
||||
|
||||
public class Startup {
|
||||
public Startup(IConfiguration configuration) => Configuration = configuration;
|
||||
|
||||
public IConfiguration Configuration { get; }
|
||||
|
|
@ -31,5 +32,4 @@ namespace c3stream {
|
|||
|
||||
app.UseEndpoints(endpoints => { endpoints.MapRazorPages(); });
|
||||
}
|
||||
}
|
||||
}
|
||||
4
Types.cs
4
Types.cs
|
|
@ -56,7 +56,7 @@ namespace c3stream {
|
|||
|
||||
public class Event {
|
||||
[JsonProperty("guid", NullValueHandling = NullValueHandling.Ignore)]
|
||||
public Guid? Guid { get; set; }
|
||||
public string Guid { get; set; }
|
||||
|
||||
[JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
|
||||
public string Title { get; set; }
|
||||
|
|
@ -144,7 +144,7 @@ namespace c3stream {
|
|||
|
||||
public partial class Talk {
|
||||
[JsonProperty("guid", NullValueHandling = NullValueHandling.Ignore)]
|
||||
public Guid? Guid { get; set; }
|
||||
public string Guid { get; set; }
|
||||
|
||||
[JsonProperty("title", NullValueHandling = NullValueHandling.Ignore)]
|
||||
public string Title { get; set; }
|
||||
|
|
|
|||
141
c3stream.cs
141
c3stream.cs
|
|
@ -1,46 +1,147 @@
|
|||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using c3stream.Pages;
|
||||
using System.Linq;
|
||||
using System.Net.Http;
|
||||
using c3stream.DataModels;
|
||||
using LinqToDB.Data;
|
||||
using Microsoft.AspNetCore.Hosting;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
|
||||
namespace c3stream {
|
||||
public static class c3stream {
|
||||
namespace c3stream;
|
||||
|
||||
public static class c3stream {
|
||||
public const string DataPath = "data";
|
||||
public const string DbFile = "_c3stream.json";
|
||||
public const string CachePath = "/mnt/storage/archive/Video/congress/";
|
||||
public const string DbFile = "c3stream.sqlite";
|
||||
public const string LogoPath = "/mnt/nvme-data/c3stream-logos/";
|
||||
public const string LogoUrl = "https://mirror.c3stream.de/logos/";
|
||||
public const string CachePath = "/mnt/zfs/storage/archive/Video/congress/";
|
||||
public const string CacheUrl = "https://mirror.c3stream.de/";
|
||||
public static object Lock = new object();
|
||||
public static object Lock = new();
|
||||
public static string DbPath = Path.Combine(DataPath, DbFile);
|
||||
|
||||
public static readonly List<ConferenceObject> Conferences = new() {
|
||||
new ConferenceObject("37c3", true),
|
||||
new ConferenceObject("mrmcd23"),
|
||||
new ConferenceObject("camp2023"),
|
||||
new ConferenceObject("gpn21"),
|
||||
new ConferenceObject("trans-tech-tent"),
|
||||
new ConferenceObject("jev22"),
|
||||
new ConferenceObject("MCH2022"),
|
||||
new ConferenceObject("gpn20"),
|
||||
new ConferenceObject("rc3-2021"),
|
||||
new ConferenceObject("rc3"),
|
||||
new ConferenceObject("36c3"),
|
||||
new ConferenceObject("camp2019"),
|
||||
new ConferenceObject("gpn19"),
|
||||
new ConferenceObject("35c3"),
|
||||
new ConferenceObject("34c3"),
|
||||
new ConferenceObject("33c3"),
|
||||
new ConferenceObject("32c3"),
|
||||
new ConferenceObject("31c3"),
|
||||
new ConferenceObject("30c3")
|
||||
};
|
||||
|
||||
public static void Main(string[] args) {
|
||||
if (!Directory.Exists(DataPath))
|
||||
Directory.CreateDirectory(DataPath);
|
||||
if (!File.Exists(DbPath))
|
||||
ConferenceModel.WriteEventMetadata();
|
||||
File.Copy(Path.Combine(DataPath, "database.init.sqlite"), DbPath);
|
||||
|
||||
DataConnection.DefaultSettings = new Database.Settings();
|
||||
Migrations.RunMigrations();
|
||||
|
||||
foreach (var conference in Conferences)
|
||||
UpdateConference(conference);
|
||||
|
||||
if (args.Length != 0) {
|
||||
if (args[0] == "logo")
|
||||
foreach (var conference in Conferences)
|
||||
Console.WriteLine($"wget {conference.LogoUri} -O {Path.Combine(LogoPath, conference.Acronym + ".png")}");
|
||||
else if (Conferences.All(p => p.Acronym != args[0]))
|
||||
Console.WriteLine("No matching conference found.");
|
||||
else
|
||||
foreach (var talk in Conferences.First(p => p.Acronym == args[0]).Talks)
|
||||
Console.WriteLine($"youtube-dl -f \"best[ext = mp4]\" {talk.FrontendLink} -o \"{Path.Combine(CachePath, args[0], talk.Slug)}.mp4\"");
|
||||
}
|
||||
else {
|
||||
CreateHostBuilder(args).Build().Run();
|
||||
}
|
||||
}
|
||||
|
||||
public static void UpdateCookie(HttpRequest resquest, HttpResponse response, string redirectUri) {
|
||||
//TODO: move this to the database as well
|
||||
public static void UpdateConference(ConferenceObject conference) {
|
||||
using var httpc = new HttpClient();
|
||||
|
||||
var jsonpath = Path.Combine(DataPath, conference.Acronym + "_index.json");
|
||||
var json = "";
|
||||
if (!File.Exists(jsonpath)) {
|
||||
json = httpc.GetStringAsync($"https://api.media.ccc.de/public/conferences/{conference.Acronym}").Result;
|
||||
File.WriteAllText(jsonpath, json);
|
||||
}
|
||||
else if (conference.Ongoing) {
|
||||
json = httpc.GetStringAsync($"https://api.media.ccc.de/public/conferences/{conference.Acronym}").Result;
|
||||
}
|
||||
else {
|
||||
json = File.ReadAllText(jsonpath);
|
||||
}
|
||||
|
||||
var parsed = Conference.FromJson(json);
|
||||
lock (Lock) {
|
||||
conference.Talks.Clear();
|
||||
conference.LogoUri = parsed.LogoUrl.AbsoluteUri;
|
||||
conference.Talks.AddRange(parsed.Events);
|
||||
conference.Talks.ForEach(p => p.Guid = p.Guid.Trim());
|
||||
}
|
||||
}
|
||||
|
||||
public static string UpdateCookie(HttpRequest request, HttpResponse response, string redirectUri) {
|
||||
var cookie = "";
|
||||
//if new bookmark is in uri
|
||||
if (resquest.Query.ContainsKey("bookmark") && resquest.Cookies["bookmark"] != resquest.Query["bookmark"]) {
|
||||
response.Cookies.Append("bookmark", resquest.Query["bookmark"], new CookieOptions {Expires = DateTimeOffset.MaxValue});
|
||||
response.Redirect(redirectUri + "bookmark=" + resquest.Query["bookmark"]);
|
||||
if (request.Query.ContainsKey("bookmark") && Guid.TryParseExact(request.Query["bookmark"], "D", out _)) {
|
||||
response.Cookies.Append("bookmark", request.Query["bookmark"], new CookieOptions { Expires = DateTimeOffset.MaxValue });
|
||||
cookie = request.Query["bookmark"];
|
||||
}
|
||||
//if no cookie exists or cookie is invalid
|
||||
else if (!resquest.Cookies.ContainsKey("bookmark") || !Guid.TryParseExact(resquest.Cookies["bookmark"], "D", out _)) {
|
||||
else if (!request.Cookies.ContainsKey("bookmark") || !Guid.TryParseExact(request.Cookies["bookmark"], "D", out _)) {
|
||||
var guid = Guid.NewGuid().ToString();
|
||||
response.Cookies.Append("bookmark", guid, new CookieOptions {Expires = DateTimeOffset.MaxValue});
|
||||
response.Redirect(redirectUri + "bookmark=" + guid);
|
||||
}
|
||||
//redir to cookie
|
||||
else if (!resquest.Query.ContainsKey("bookmark")) {
|
||||
response.Redirect(redirectUri + "bookmark=" + resquest.Cookies["bookmark"]);
|
||||
response.Cookies.Append("bookmark", guid, new CookieOptions { Expires = DateTimeOffset.MaxValue });
|
||||
cookie = guid;
|
||||
}
|
||||
else {
|
||||
cookie = request.Cookies["bookmark"];
|
||||
}
|
||||
|
||||
public static IHostBuilder CreateHostBuilder(string[] args) =>
|
||||
Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
|
||||
if (request.Query.ContainsKey("bookmark"))
|
||||
response.Redirect(redirectUri);
|
||||
|
||||
return cookie;
|
||||
}
|
||||
|
||||
public static Event GetEventByGuid(string guid) {
|
||||
return Conferences.SelectMany(c => c.Talks.Where(e => e.Guid == guid)).FirstOrDefault();
|
||||
}
|
||||
|
||||
public static IEnumerable<Event> GetEventsByGuid(IEnumerable<string> guids) {
|
||||
return Conferences.SelectMany(c => c.Talks.Where(e => guids.Contains(e.Guid)));
|
||||
}
|
||||
|
||||
public static ConferenceObject GetConferenceByEventGuid(string guid) {
|
||||
return Conferences.FirstOrDefault(c => c.Talks.Any(t => t.Guid == guid));
|
||||
}
|
||||
|
||||
public static IHostBuilder CreateHostBuilder(string[] args) => Host.CreateDefaultBuilder(args).ConfigureWebHostDefaults(webBuilder => { webBuilder.UseStartup<Startup>(); });
|
||||
|
||||
public class ConferenceObject {
|
||||
public string Acronym;
|
||||
public string LogoUri;
|
||||
public bool Ongoing;
|
||||
public List<Event> Talks = new();
|
||||
|
||||
public ConferenceObject(string acronym, bool ongoing = false) {
|
||||
Acronym = acronym;
|
||||
Ongoing = ongoing;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,11 +1,16 @@
|
|||
<Project Sdk="Microsoft.NET.Sdk.Web">
|
||||
|
||||
<PropertyGroup>
|
||||
<TargetFramework>netcoreapp3.1</TargetFramework>
|
||||
<TargetFramework>net70</TargetFramework>
|
||||
<Configurations>Release;Debug</Configurations>
|
||||
<Platforms>x64</Platforms>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
|
||||
<PackageReference Include="linq2db" Version="3.6.0" />
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="System.Data.SQLite.Core" Version="1.0.115" />
|
||||
<PackageReference Include="System.Data.SQLite.Core.osx.arm64" Version="1.0.117" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
|
@ -32,5 +37,7 @@
|
|||
<Content Remove="data\**" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<Folder Include="DataModels" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
|
|||
12
c3stream.sln
12
c3stream.sln
|
|
@ -4,13 +4,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "c3stream", "c3stream.csproj
|
|||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Release|x64 = Release|x64
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Debug|x64.Build.0 = Debug|x64
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Release|x64.ActiveCfg = Release|x64
|
||||
{BC6A24FE-B35F-4F0A-8E8E-221E61E41EEF}.Release|x64.Build.0 = Release|x64
|
||||
EndGlobalSection
|
||||
EndGlobal
|
||||
|
|
|
|||
BIN
database.init.sqlite
Normal file
BIN
database.init.sqlite
Normal file
Binary file not shown.
12
v4_to_v5_migrator.sh
Executable file
12
v4_to_v5_migrator.sh
Executable file
|
|
@ -0,0 +1,12 @@
|
|||
#!/bin/bash
|
||||
# Requires jq and sqlite3
|
||||
|
||||
cp database.init.sqlite data/c3stream.sqlite
|
||||
|
||||
rm migration.sql
|
||||
|
||||
for row in $(cat "data/c3stream.user.json" | jq -c '.[]'); do
|
||||
echo "INSERT INTO States (TalkId, UserId, State) VALUES ($(echo $row | jq '.TalkId'),$(echo $row | jq '.UserId'),$(echo $row | jq '.State'));" | tee -a migration.sql
|
||||
done
|
||||
|
||||
cat migration.sql | sqlite3 data/c3stream.sqlite
|
||||
BIN
wwwroot/.DS_Store
vendored
Normal file
BIN
wwwroot/.DS_Store
vendored
Normal file
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -2,26 +2,20 @@
|
|||
for details on configuring this project to bundle and minify static web assets. */
|
||||
|
||||
a.navbar-brand {
|
||||
color: #e3d7c0 !important;
|
||||
white-space: normal;
|
||||
text-align: center;
|
||||
word-break: break-all;
|
||||
}
|
||||
|
||||
/* Provide sufficient contrast against white background */
|
||||
a {
|
||||
color: #0366d6;
|
||||
a:not(.btn):not(.navbar-brand) {
|
||||
color: #7ca9c8 !important;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
color: #fff;
|
||||
background-color: #1b6ec2;
|
||||
border-color: #1861ac;
|
||||
}
|
||||
|
||||
.nav-pills .nav-link.active, .nav-pills .show > .nav-link {
|
||||
color: #fff;
|
||||
background-color: #1b6ec2;
|
||||
border-color: #1861ac;
|
||||
.navbar {
|
||||
color: #ebddc4 !important;
|
||||
background-color: #1b1b18 !important;
|
||||
border-color: #3c3d3c !important;
|
||||
}
|
||||
|
||||
/* Sticky footer styles
|
||||
|
|
@ -29,19 +23,13 @@ a {
|
|||
html {
|
||||
font-size: 14px;
|
||||
}
|
||||
|
||||
@media (min-width: 768px) {
|
||||
html {
|
||||
font-size: 16px;
|
||||
}
|
||||
}
|
||||
|
||||
.border-top {
|
||||
border-top: 1px solid #e5e5e5;
|
||||
}
|
||||
.border-bottom {
|
||||
border-bottom: 1px solid #e5e5e5;
|
||||
}
|
||||
|
||||
.box-shadow {
|
||||
box-shadow: 0 .25rem .75rem rgba(0, 0, 0, .05);
|
||||
}
|
||||
|
|
@ -61,7 +49,14 @@ html {
|
|||
body {
|
||||
/* Margin bottom by footer height */
|
||||
margin-bottom: 60px;
|
||||
color: #ebddc4 !important;
|
||||
background-color: #1b1b18 !important;
|
||||
}
|
||||
|
||||
.table {
|
||||
color: #ebddc4 !important;
|
||||
}
|
||||
|
||||
.footer {
|
||||
position: absolute;
|
||||
bottom: 0;
|
||||
|
|
@ -72,4 +67,47 @@ body {
|
|||
|
||||
.table td {
|
||||
vertical-align: middle;
|
||||
border-color: #3c3d3c !important;
|
||||
}
|
||||
|
||||
.table th {
|
||||
vertical-align: middle;
|
||||
border-color: #3c3d3c !important;
|
||||
}
|
||||
|
||||
.btn-primary.disabled {
|
||||
color: #afafa2;
|
||||
border-color: #3c6385;
|
||||
background-color: #254667 !important;
|
||||
opacity: 1;
|
||||
border-top-color: #254667 !important;
|
||||
border-bottom-color: #254667 !important;
|
||||
}
|
||||
|
||||
.btn-primary {
|
||||
color: #ffffff;
|
||||
border-color: #3c6385;
|
||||
background-color: #375a7a;
|
||||
}
|
||||
|
||||
.btn-c3saction {
|
||||
width: 42px !important;
|
||||
}
|
||||
|
||||
.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open > .dropdown-toggle.btn-primary {
|
||||
color: #ffffff !important;
|
||||
border-color: #3c6385 !important;
|
||||
background-color: #2c5f93 !important;
|
||||
}
|
||||
|
||||
.border-top {
|
||||
border-top-color: #3c3d3c !important;
|
||||
}
|
||||
|
||||
code {
|
||||
color: #cB6d87 !important;
|
||||
}
|
||||
|
||||
.fa-times {
|
||||
|
||||
}
|
||||
|
|
@ -231,21 +231,21 @@ select {
|
|||
}
|
||||
|
||||
button,
|
||||
[type="button"],
|
||||
[role="button"],
|
||||
[type="reset"],
|
||||
[type="submit"] {
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
|
||||
button:not(:disabled),
|
||||
[type="button"]:not(:disabled),
|
||||
[role="button"]:not(:disabled),
|
||||
[type="reset"]:not(:disabled),
|
||||
[type="submit"]:not(:disabled) {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button::-moz-focus-inner,
|
||||
[type="button"]::-moz-focus-inner,
|
||||
[role="button"]::-moz-focus-inner,
|
||||
[type="reset"]::-moz-focus-inner,
|
||||
[type="submit"]::-moz-focus-inner {
|
||||
padding: 0;
|
||||
|
|
|
|||
8
wwwroot/lib/bootstrap/dist/css/bootstrap.css
vendored
8
wwwroot/lib/bootstrap/dist/css/bootstrap.css
vendored
|
|
@ -261,21 +261,21 @@ select {
|
|||
}
|
||||
|
||||
button,
|
||||
[type="button"],
|
||||
[role="button"],
|
||||
[type="reset"],
|
||||
[type="submit"] {
|
||||
-webkit-appearance: button;
|
||||
}
|
||||
|
||||
button:not(:disabled),
|
||||
[type="button"]:not(:disabled),
|
||||
[role="button"]:not(:disabled),
|
||||
[type="reset"]:not(:disabled),
|
||||
[type="submit"]:not(:disabled) {
|
||||
cursor: pointer;
|
||||
}
|
||||
|
||||
button::-moz-focus-inner,
|
||||
[type="button"]::-moz-focus-inner,
|
||||
[role="button"]::-moz-focus-inner,
|
||||
[type="reset"]::-moz-focus-inner,
|
||||
[type="submit"]::-moz-focus-inner {
|
||||
padding: 0;
|
||||
|
|
@ -2993,7 +2993,7 @@ fieldset:disabled a.btn {
|
|||
|
||||
input[type="submit"].btn-block,
|
||||
input[type="reset"].btn-block,
|
||||
input[type="button"].btn-block {
|
||||
input[role="button"].btn-block {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 684 KiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 2.3 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 2.1 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 1.9 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
File diff suppressed because it is too large
Load diff
|
Before Width: | Height: | Size: 1.5 MiB |
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-brands-400-5.0.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-brands-400-5.0.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-brands-400-5.12.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-brands-400-5.12.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-brands-400-5.3.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-brands-400-5.3.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-brands-400-5.8.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-brands-400-5.8.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.10.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.10.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.11.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.11.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.13.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.13.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.3.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.3.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.5.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.5.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.7.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.7.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.9.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.0.9.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.1.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.1.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.10.1.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.10.1.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.10.2.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.10.2.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.11.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.11.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.11.1.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.11.1.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.12.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.12.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.2.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.2.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.3.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.3.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.4.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.4.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.8.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.8.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.9.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-duotone-900-5.9.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.0.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.10.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.10.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.11.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.11.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.13.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.13.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.3.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.3.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.5.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.5.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.7.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.7.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.9.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.0.9.woff2
Normal file
Binary file not shown.
BIN
wwwroot/webfonts/pro-fa-light-300-5.1.0.woff2
Normal file
BIN
wwwroot/webfonts/pro-fa-light-300-5.1.0.woff2
Normal file
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show more
Loading…
Reference in a new issue