glax/Tranga
2
0
Fork 0
Code Issues Pull Requests Releases 25 Activity

Compare commits

base: glax:f61e51e50622aff68e8f7dc54b2a1c25a6f66ed0
Branches Tags
glax:master
glax:Server-V2
glax:asuratoon
glax:cuttingedge
glax:cuttingedge-merge-ServerV2
glax:dev
glax:1.5
glax:1.4.2
glax:1.4.1
glax:1.4
glax:v1.3
glax:v1.2
glax:1.1.1
glax:1.1
glax:1.0
glax:0.7
glax:0.6.2
glax:0.6.1
glax:0.6
glax:0.5.1
glax:0.5
glax:0.4.1
glax:0.4
glax:0.3.3
glax:0.3.2
glax:0.3.1
glax:0.3
glax:0.2.2
glax:0.2.1
glax:v0.2
glax:v0.1
..
compare: glax:d0bfb262bfd3a554f2d2b079365bf785df921834
Branches Tags
glax:master
glax:Server-V2
glax:asuratoon
glax:cuttingedge
glax:cuttingedge-merge-ServerV2
glax:dev
glax:1.5
glax:1.4.2
glax:1.4.1
glax:1.4
glax:v1.3
glax:v1.2
glax:1.1.1
glax:1.1
glax:1.0
glax:0.7
glax:0.6.2
glax:0.6.1
glax:0.6
glax:0.5.1
glax:0.5
glax:0.4.1
glax:0.4
glax:0.3.3
glax:0.3.2
glax:0.3.1
glax:0.3
glax:0.2.2
glax:0.2.1
glax:v0.2
glax:v0.1

26 Commits
f61e51e506 ... d0bfb262bf

Author SHA1 Message Date
Glax
d0bfb262bf Merge remote-tracking branch 'refs/remotes/github/master' into cuttingedge-merge-ServerV2 2024-07-09 11:22:05 +02:00
Glax
4f14f15ade
Merge pull request #200 from C9Glax/dependabot/github_actions/docker/setup-qemu-action-3.1.0 
Bump docker/setup-qemu-action from 2.2.0 to 3.1.0
 2024-07-09 11:20:29 +02:00
Glax
d89a24fd11
Merge pull request #201 from C9Glax/dependabot/github_actions/docker/build-push-action-6.3.0 
Bump docker/build-push-action from 6.1.0 to 6.3.0
 2024-07-09 11:20:14 +02:00
Glax
a5859e3c82
Merge pull request #203 from C9Glax/dependabot/github_actions/docker/setup-buildx-action-3.4.0 
Bump docker/setup-buildx-action from 3.3.0 to 3.4.0
 2024-07-09 11:19:55 +02:00
Glax
33e5d65785 fix Kavita GetLibraries 2024-07-09 11:17:50 +02:00
dependabot[bot]
d60ed77dbe
Bump docker/setup-buildx-action from 3.3.0 to 3.4.0 
Bumps [docker/setup-buildx-action](https://github.com/docker/setup-buildx-action) from 3.3.0 to 3.4.0.
- [Release notes](https://github.com/docker/setup-buildx-action/releases)
- [Commits](https://github.com/docker/setup-buildx-action/compare/v3.3.0...v3.4.0)

---
updated-dependencies:
- dependency-name: docker/setup-buildx-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-05 05:11:09 +00:00
dependabot[bot]
e15c6816b5
Bump docker/build-push-action from 6.1.0 to 6.3.0 
Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.1.0 to 6.3.0.
- [Release notes](https://github.com/docker/build-push-action/releases)
- [Commits](https://github.com/docker/build-push-action/compare/v6.1.0...v6.3.0)

---
updated-dependencies:
- dependency-name: docker/build-push-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-04 05:56:47 +00:00
dependabot[bot]
4a4fe4b40d
Bump docker/setup-qemu-action from 2.2.0 to 3.1.0 
Bumps [docker/setup-qemu-action](https://github.com/docker/setup-qemu-action) from 2.2.0 to 3.1.0.
- [Release notes](https://github.com/docker/setup-qemu-action/releases)
- [Commits](https://github.com/docker/setup-qemu-action/compare/v2.2.0...v3.1.0)

---
updated-dependencies:
- dependency-name: docker/setup-qemu-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2024-07-04 05:56:42 +00:00
Glax
4881789970 Merge branch 'refs/heads/cuttingedge' 2024-06-29 22:50:07 +02:00
Glax
be1e6fe988 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-29 22:49:56 +02:00
Glax
eba511749b
Merge pull request #199 from C9Glax/cuttingedge 
Merge cuttingedge to latest.
 2024-06-29 19:49:06 +02:00
Glax
de4c57a0cd Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-29 19:37:09 +02:00
Glax
e9376e3782
Merge pull request #196 from C9Glax/master 
Merge Github Actions
 2024-06-29 19:21:41 +02:00
Glax
7c217a7e33 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-29 19:20:16 +02:00
Glax
37dfb4df02 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-02 01:05:20 +02:00
Glax
bbc750d731 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-02 00:23:23 +02:00
Glax
351144e763 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-02 00:09:18 +02:00
Glax
048b165d76 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-06-01 22:09:18 +02:00
Glax
a5dbed9525 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-05-26 23:04:27 +02:00
Glax
f948809bcd Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-05-26 22:51:59 +02:00
Glax
6ca8d58e43 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-05-26 18:46:58 +02:00
Glax
b5e9e03f64 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-05-26 18:34:57 +02:00
Glax
e05684d5d1 Fix loading file results in "null"-job and crashes. 2024-05-26 18:22:51 +02:00
Glax
4a7d23c0d9 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-05-26 18:10:45 +02:00
Glax
811a183af2 Merge branch 'refs/heads/cuttingedge-merge-ServerV2' into cuttingedge 2024-04-27 19:09:22 +02:00
Glax
2e8b896f3b Fix #178 wrong check on parsing variable aprilfoolsmode 2024-04-27 17:53:08 +02:00
7 changed files with 21 additions and 19 deletions
Show Stats Expand all files Collapse all files

6
.github/workflows/docker-base.yml vendored
View File

@ -15,12 +15,12 @@ jobs:
# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.1.0
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0
# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
@ -31,7 +31,7 @@ jobs:
# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push base
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./
file: ./Dockerfile-base

6
.github/workflows/docker-image-cuttingedge.yml vendored
View File

@ -17,12 +17,12 @@ jobs:
# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.1.0
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0
# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
@ -33,7 +33,7 @@ jobs:
# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./
file: ./Dockerfile

6
.github/workflows/docker-image-dev.yml vendored
View File

@ -17,12 +17,12 @@ jobs:
# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.1.0
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0
# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
@ -33,7 +33,7 @@ jobs:
# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./
file: ./Dockerfile

6
.github/workflows/docker-image-master.yml vendored
View File

@ -17,12 +17,12 @@ jobs:
# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.1.0
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0
# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
@ -33,7 +33,7 @@ jobs:
# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./
file: ./Dockerfile

6
.github/workflows/docker-image-serverv2.yml vendored
View File

@ -17,12 +17,12 @@ jobs:
# https://github.com/docker/setup-qemu-action#usage
- name: Set up QEMU
uses: docker/setup-qemu-action@v2.2.0
uses: docker/setup-qemu-action@v3.1.0
# https://github.com/marketplace/actions/docker-setup-buildx
- name: Set up Docker Buildx
id: buildx
uses: docker/setup-buildx-action@v3.3.0
uses: docker/setup-buildx-action@v3.4.0
# https://github.com/docker/login-action#docker-hub
- name: Login to Docker Hub
@ -33,7 +33,7 @@ jobs:
# https://github.com/docker/build-push-action#multi-platform-image
- name: Build and push API
uses: docker/build-push-action@v6.1.0
uses: docker/build-push-action@v6.3.0
with:
context: ./
file: ./Dockerfile

8
Tranga/LibraryConnectors/Kavita.cs
View File

@ -83,7 +83,7 @@ public class Kavita : LibraryConnector
private IEnumerable<KavitaLibrary> GetLibraries()
{
Log("Getting libraries.");
Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library", "Bearer", auth, logger);
Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library/libraries", "Bearer", auth, logger);
if (data == Stream.Null)
{
Log("No libraries returned");
@ -96,11 +96,13 @@ public class Kavita : LibraryConnector
return Array.Empty<KavitaLibrary>();
}
HashSet<KavitaLibrary> ret = new();
List<KavitaLibrary> ret = new();
foreach (JsonNode? jsonNode in result)
{
var jObject = (JsonObject?)jsonNode;
JsonObject? jObject = (JsonObject?)jsonNode;
if(jObject is null)
continue;
int libraryId = jObject!["id"]!.GetValue<int>();
string libraryName = jObject["name"]!.GetValue<string>();
ret.Add(new KavitaLibrary(libraryId, libraryName));

2
Tranga/Server.cs
View File

@ -410,7 +410,7 @@ public class Server : GlobalBase
break;
case "Settings/AprilFoolsMode":
if (!requestVariables.TryGetValue("enabled", out string? aprilFoolsModeEnabledStr) ||
bool.TryParse(aprilFoolsModeEnabledStr, out bool aprilFoolsModeEnabled))
!bool.TryParse(aprilFoolsModeEnabledStr, out bool aprilFoolsModeEnabled))
{
SendResponse(HttpStatusCode.BadRequest, response);
break;