Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-08-06 20:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'LBPUnion:main' into main

Browse source
This commit is contained in:
LumaLivy 2021-11-07 17:12:45 -05:00 • committed by GitHub
commit a3f16c6e4d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 75 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

33
ProjectLighthouse/Controllers/PhotosController.cs
View file

@ -1,4 +1,5 @@
#nullable enable
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@ -39,7 +40,7 @@ namespace LBPUnion.ProjectLighthouse.Controllers
photo.CreatorId = user.UserId;
photo.Creator = user;
foreach (PhotoSubject subject in photo.Subjects)
foreach (PhotoSubject subject in photo.SubjectsXmlDontUse) // fine for here
{
subject.User = await this.database.Users.FirstOrDefaultAsync(u => u.Username == subject.Username);
@ -71,15 +72,41 @@ namespace LBPUnion.ProjectLighthouse.Controllers
}
[HttpGet("photos/by")]
public async Task<IActionResult> UserPhotos([FromQuery] string user)
public async Task<IActionResult> UserPhotosBy([FromQuery] string user, [FromQuery] int pageStart, [FromQuery] int pageSize)
{
User? userFromQuery = await this.database.Users.FirstOrDefaultAsync(u => u.Username == user);
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
if (user == null) return this.NotFound();
List<Photo> photos = await this.database.Photos.Where(p => p.CreatorId == userFromQuery.UserId).Take(10).ToListAsync();
List<Photo> photos = await this.database.Photos.Where(p => p.CreatorId == userFromQuery.UserId)
.OrderByDescending(s => s.Timestamp)
.Skip(pageStart - 1)
.Take(Math.Min(pageSize, 30))
.ToListAsync();
string response = photos.Aggregate(string.Empty, (s, photo) => s + photo.Serialize(0));
return this.Ok(LbpSerializer.StringElement("photos", response));
}
[HttpGet("photos/with")]
public async Task<IActionResult> UserPhotosWith([FromQuery] string user, [FromQuery] int pageStart, [FromQuery] int pageSize)
{
User? userFromQuery = await this.database.Users.FirstOrDefaultAsync(u => u.Username == user);
// ReSharper disable once ConditionIsAlwaysTrueOrFalse
if (user == null) return this.NotFound();
List<Photo> photos = new();
foreach (Photo photo in this.database.Photos)
{
photos.AddRange(photo.Subjects.Where(subject => subject.User.UserId == userFromQuery.UserId).Select(_ => photo));
}
string response = photos.OrderByDescending
(s => s.Timestamp)
.Skip(pageStart - 1)
.Take(Math.Min(pageSize, 30))
.Aggregate(string.Empty, (s, photo) => s + photo.Serialize(0));
return this.Ok(LbpSerializer.StringElement("photos", response));
}
}
}

66
ProjectLighthouse/Types/Photo.cs
View file

@ -33,20 +33,41 @@ namespace LBPUnion.ProjectLighthouse.Types
[XmlElement("plan")]
public string PlanHash { get; set; }
// [XmlIgnore]
// public int SlotId { get; set; }
//
// [XmlIgnore]
// [ForeignKey(nameof(SlotId))]
// public Slot Slot { get; set; }
[NotMapped]
private List<PhotoSubject>? subjects;
/// <summary>
/// Only use when parsing from XML.
/// </summary>
[NotMapped]
[XmlArray("subjects")]
[XmlArrayItem("subject")]
public List<PhotoSubject> Subjects { get; set; }
public List<PhotoSubject> SubjectsXmlDontUse {
get => null!;
set => Subjects = value;
}
[NotMapped]
public List<PhotoSubject> Subjects {
get {
if (this.subjects != null) return this.subjects;
List<PhotoSubject> response = new();
using Database database = new();
foreach (string idStr in this.PhotoSubjectIds)
{
if (string.IsNullOrEmpty(idStr)) continue;
if (!int.TryParse(idStr, out int id)) throw new InvalidCastException(idStr + " is not a valid number.");
PhotoSubject? photoSubject = database.PhotoSubjects.Include(p => p.User).FirstOrDefault(p => p.PhotoSubjectId == id);
if (photoSubject == null) continue;
response.Add(photoSubject);
}
return response;
}
set => this.subjects = value;
}
[NotMapped]
[XmlIgnore]
@ -62,32 +83,11 @@ namespace LBPUnion.ProjectLighthouse.Types
[ForeignKey(nameof(CreatorId))]
public User Creator { get; set; }
public List<PhotoSubject> GetSubjects()
{
List<PhotoSubject> response = new();
using Database database = new();
foreach (string idStr in this.PhotoSubjectIds)
{
if (string.IsNullOrEmpty(idStr)) continue;
if (!int.TryParse(idStr, out int id)) throw new InvalidCastException(idStr + " is not a valid number.");
PhotoSubject? photoSubject = database.PhotoSubjects.Include(p => p.User).FirstOrDefault(p => p.PhotoSubjectId == id);
if (photoSubject == null) continue;
response.Add(photoSubject);
}
return response;
}
public string Serialize(int slotId)
{
string slot = LbpSerializer.TaggedStringElement("slot", LbpSerializer.StringElement("id", slotId), "type", "user");
string subjects = this.GetSubjects().Aggregate(string.Empty, (s, subject) => s + subject.Serialize());
string subjectsAggregate = this.Subjects.Aggregate(string.Empty, (s, subject) => s + subject.Serialize());
string photo = LbpSerializer.StringElement("id", this.PhotoId) +
LbpSerializer.StringElement("small", this.SmallHash) +
@ -95,7 +95,7 @@ namespace LBPUnion.ProjectLighthouse.Types
LbpSerializer.StringElement("large", this.LargeHash) +
LbpSerializer.StringElement("plan", this.PlanHash) +
LbpSerializer.StringElement("author", this.CreatorId) +
LbpSerializer.StringElement("subjects", subjects) +
LbpSerializer.StringElement("subjects", subjectsAggregate) +
slot;
return LbpSerializer.TaggedStringElement("photo", photo, "timestamp", Timestamp * 1000);

7
ProjectLighthouse/Types/User.cs
View file

@ -37,7 +37,12 @@ namespace LBPUnion.ProjectLighthouse.Types
}
[NotMapped]
public int PhotosWithMeCount { get; set; }
public int PhotosWithMeCount {
get {
using Database database = new();
return Enumerable.Sum(database.Photos, photo => photo.Subjects.Count(subject => subject.User.UserId == this.UserId));
}
}
public bool CommentsEnabled { get; set; }

12
README.md
View file

@ -74,11 +74,11 @@ Some modifications may require updates to the database schema. You can automatic
## Compatibility across games and platforms
| Game | Console (PS3/Vita) | Emulator (RPCS3) | Next-Gen (PS4/PS5) |
|----------|-----------------------------------|------------------------------------------------|--------------------|
| LBP1 | Compatible | Incompatible, crashes on entering pod computer | N/A |
| LBP2 | Compatible | Compatible with patched RPCS3 | N/A |
| LBP3 | Somewhat compatible | Somewhat compatible with workaround | Incompatible |
| LBP Vita | Potentially compatible | N/A | N/A |
| Game | Console (PS3/Vita) | Emulator (RPCS3) | Next-Gen (PS4/PS5) |
|----------|-------------------------------------|------------------------------------------------|--------------------|
| LBP1 | Compatible | Incompatible, crashes on entering pod computer | N/A |
| LBP2 | Compatible | Compatible with patched RPCS3 | N/A |
| LBP3 | Somewhat compatible | Somewhat compatible with workaround | Incompatible |
| LBP Vita | Somewhat compatible with workaround | N/A | N/A |
Project Lighthouse is still a heavy work in progress, so this is subject to change at any point.