Skip to content

Commit

Permalink
feat: Update beta release settings and Dockerfile
Browse files Browse the repository at this point in the history
- Updated the tag name and release name in the beta release workflow to use the current version.
- Modified the Dockerfile to set the timezone to UTC.

fix: Export axios from API module

- Added an export statement for axios in the API module.

fix: Fix user synchronization in Jellyfin helper

- Updated the synchronization logic to compare token values as strings.

chore: Update Wizarr version to 3.0.3

- Updated the version number in the package.json file.
  • Loading branch information
realashleybailey committed Aug 25, 2023
1 parent aa6322c commit 3e9b0bf
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/beta-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ jobs:
curl -X POST \
-H "Authorization: token $GITHUB_TOKEN" \
-d '{
"tag_name": "v'${{ steps.get_current_version.outputs.current_version }}'",
"tag_name": "'${{ steps.get_current_version.outputs.current_version }}'",
"target_commitish": "v3-alpha",
"name": "Pre-Release v'${{ steps.get_current_version.outputs.current_version }}'",
"name": "Pre-Release V'${{ steps.get_current_version.outputs.current_version }}'",
"body": "${{ steps.generate_release_notes.outputs.release_notes }}",
"prerelease": true
}' \
Expand Down
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ RUN apk add tzdata nodejs npm cargo libffi-dev openssl-dev nmap tzdata
RUN pip3 install --upgrade pip
RUN pip3 install -r requirements.txt

ENV TZ UTC
RUN cp /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

WORKDIR /data/app/static

RUN npm install
Expand Down
4 changes: 3 additions & 1 deletion app/static/src/ts/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,6 @@ function error(error: any) {
axios.defaults.headers.common["X-CSRF-TOKEN"] = cookie.get('csrf_access_token');
axios.interceptors.response.use(resp, error);

addToWindow(['api', 'axios'], axios);
addToWindow(['api', 'axios'], axios);

export default axios;
4 changes: 2 additions & 2 deletions helpers/jellyfin.py
Original file line number Diff line number Diff line change
Expand Up @@ -361,13 +361,13 @@ def sync_jellyfin_users(server_api_key: Optional[str] = None, server_url: Option

# If jellyfin_users.id not in database_users.token, add to database
for jellyfin_user in jellyfin_users:
if jellyfin_user["Id"] not in [database_user.token for database_user in database_users]:
if str(jellyfin_user["Id"]) not in [str(database_user.token) for database_user in database_users]:
create_user(username=jellyfin_user["Name"], token=jellyfin_user["Id"])
info(f"User {jellyfin_user['Name']} successfully imported to database.")

# If database_users.token not in jellyfin_users.id, delete from database
for database_user in database_users:
if database_user.token not in [jellyfin_user["Id"] for jellyfin_user in jellyfin_users]:
if str(database_user.token) not in [str(jellyfin_user["Id"]) for jellyfin_user in jellyfin_users]:
database_user.delete_instance()
info(f"User {database_user.username} successfully deleted from database.")

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "Wizarr",
"version": "3.0.2",
"version": "3.0.3",
"description": "Wizarr is a web application that allows you to share your media library with your friends and family with ease.",
"scripts": {
"server:start": "APP_URL=127.0.0.1:5000 flask run",
Expand Down

0 comments on commit 3e9b0bf

Please sign in to comment.