GitHub
commit
8c4f429d51
@ -1,59 +0,0 @@
|
||||
name: Build and test api
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ main, develop ]
|
||||
pull_request:
|
||||
branches: [ main, develop ]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
|
||||
build:
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-api
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache build data
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
target
|
||||
~/.cargo/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Install OS-specific dependencies
|
||||
uses: knicknic/os-specific-run@v1.0.3
|
||||
with:
|
||||
linux: |
|
||||
sudo apt-get update
|
||||
DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y
|
||||
|
||||
- name: Build
|
||||
run: cargo build
|
||||
|
||||
- name: Build API
|
||||
run: cargo build --features=client-api
|
||||
|
||||
- name: Build Plugin
|
||||
run: cargo build --features=tauri-plugin
|
||||
|
||||
- name: Test
|
||||
run: cargo test --all-features
|
||||
@ -1,51 +0,0 @@
|
||||
name: Build daemon
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ main, develop ]
|
||||
pull_request:
|
||||
branches: [ main, develop ]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
|
||||
build:
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-daemon
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache build data
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
target
|
||||
~/.cargo/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Build
|
||||
run: cargo build --release --no-default-features
|
||||
|
||||
- name: Upload artifacts
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: mediarepo-daemon-${{ runner.os }}
|
||||
path: |
|
||||
target/release/mediarepo-daemon*
|
||||
@ -1,150 +0,0 @@
|
||||
name: Build ui
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
pull_request:
|
||||
branches:
|
||||
- main
|
||||
- develop
|
||||
|
||||
jobs:
|
||||
|
||||
build-debug:
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-ui
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache Dependencies
|
||||
if: ${{ !env.ACT }}
|
||||
id: cache-dependencies
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
node_modules
|
||||
src-tauri/target/**/deps
|
||||
/home/runner/.cargo/bin
|
||||
~/.cargo
|
||||
key: ${{ runner.os }}-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-dependencies-
|
||||
${{ runner.os }}-release-dependencies-
|
||||
|
||||
- name: Use Node.js 16
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 16
|
||||
|
||||
- name: Install Tauri
|
||||
run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri
|
||||
|
||||
- name: Install Angular CLI
|
||||
run: npm install -g @angular/cli
|
||||
|
||||
- name: Install yarn
|
||||
run: npm install -g yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install
|
||||
|
||||
- name: Install OS-specific dependencies
|
||||
uses: knicknic/os-specific-run@v1.0.3
|
||||
with:
|
||||
linux: |
|
||||
sudo apt-get update
|
||||
DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y
|
||||
|
||||
- name: Build project
|
||||
run: cargo tauri build --debug
|
||||
|
||||
- name: Upload artifacts
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: mediarepo-ui-${{ runner.os }}-debug
|
||||
path: |
|
||||
src-tauri/target/debug/bundle
|
||||
src-tauri/target/debug/mediarepo-ui*
|
||||
|
||||
build-release:
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-ui
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache Dependencies
|
||||
if: ${{ !env.ACT }}
|
||||
id: cache-dependencies
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
node_modules
|
||||
src-tauri/target
|
||||
/home/runner/.cargo
|
||||
~/.cargo
|
||||
key: ${{ runner.os }}-release-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-release-dependencies-
|
||||
${{ runner.os }}-dependencies-
|
||||
|
||||
- name: Use Node.js 16
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 16
|
||||
|
||||
- name: Install Tauri
|
||||
run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri
|
||||
|
||||
- name: Install Angular CLI
|
||||
run: npm install -g @angular/cli
|
||||
|
||||
- name: Install yarn
|
||||
run: npm install -g yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install
|
||||
|
||||
- name: Install OS-specific dependencies
|
||||
uses: knicknic/os-specific-run@v1.0.3
|
||||
with:
|
||||
linux: |
|
||||
sudo apt-get update
|
||||
DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y
|
||||
|
||||
- name: Build project
|
||||
run: cargo tauri build
|
||||
|
||||
- name: Upload artifacts
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: mediarepo-ui-${{ runner.os }}-release
|
||||
path: |
|
||||
src-tauri/target/release/bundle
|
||||
src-tauri/target/release/mediarepo-ui*
|
||||
@ -0,0 +1,174 @@
|
||||
name: Build and test
|
||||
|
||||
on:
|
||||
workflow_dispatch:
|
||||
push:
|
||||
branches: [ main, gh-actions ]
|
||||
pull_request:
|
||||
branches: [ main ]
|
||||
|
||||
env:
|
||||
CARGO_TERM_COLOR: always
|
||||
|
||||
jobs:
|
||||
|
||||
build-api:
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-api
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache build data
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
target
|
||||
~/.cargo/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Install OS-specific dependencies
|
||||
uses: knicknic/os-specific-run@v1.0.3
|
||||
with:
|
||||
linux: |
|
||||
sudo apt-get update
|
||||
DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y
|
||||
|
||||
- name: Build
|
||||
run: cargo build
|
||||
|
||||
- name: Build API
|
||||
run: cargo build --features=client-api
|
||||
|
||||
- name: Build Plugin
|
||||
run: cargo build --features=tauri-plugin
|
||||
|
||||
- name: Test
|
||||
run: cargo test --all-features
|
||||
|
||||
build-daemon:
|
||||
|
||||
# to run fewer steps in parallel
|
||||
needs: build-api
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-daemon
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache build data
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
target
|
||||
~/.cargo/
|
||||
key: ${{ runner.os }}-cargo-${{ hashFiles('Cargo.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-cargo-
|
||||
|
||||
- name: Build
|
||||
run: cargo build --release --no-default-features
|
||||
|
||||
- name: Upload artifacts
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: mediarepo-daemon-${{ runner.os }}
|
||||
path: |
|
||||
target/release/mediarepo-daemon*
|
||||
|
||||
build-ui:
|
||||
|
||||
# to run fewer steps in parallel
|
||||
needs: build-api
|
||||
|
||||
defaults:
|
||||
run:
|
||||
shell: bash
|
||||
working-directory: mediarepo-ui
|
||||
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
os: [ubuntu-latest, macos-latest, windows-latest]
|
||||
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
if: ${{ !env.ACT }}
|
||||
|
||||
- name: Cache Dependencies
|
||||
if: ${{ !env.ACT }}
|
||||
id: cache-dependencies
|
||||
uses: actions/cache@v2
|
||||
with:
|
||||
path: |
|
||||
node_modules
|
||||
src-tauri/target
|
||||
/home/runner/.cargo
|
||||
~/.cargo
|
||||
key: ${{ runner.os }}-release-dependencies-${{ hashFiles('src-tauri/Cargo.lock') }}-${{ hashFiles('yarn.lock') }}
|
||||
restore-keys: |
|
||||
${{ runner.os }}-release-dependencies-
|
||||
${{ runner.os }}-dependencies-
|
||||
|
||||
- name: Use Node.js 16
|
||||
uses: actions/setup-node@v1
|
||||
with:
|
||||
node-version: 16
|
||||
|
||||
- name: Install Tauri
|
||||
run: cargo install tauri-cli --git https://github.com/tauri-apps/tauri
|
||||
|
||||
- name: Install Angular CLI
|
||||
run: npm install -g @angular/cli
|
||||
|
||||
- name: Install yarn
|
||||
run: npm install -g yarn
|
||||
|
||||
- name: Install dependencies
|
||||
run: yarn install
|
||||
|
||||
- name: Install OS-specific dependencies
|
||||
uses: knicknic/os-specific-run@v1.0.3
|
||||
with:
|
||||
linux: |
|
||||
sudo apt-get update
|
||||
DEBIAN_FRONTEND=noninteractive sudo apt-get install libwebkit2gtk-4.0-dev libgtk-3-dev libappindicator3-dev -y
|
||||
|
||||
- name: Build project
|
||||
run: cargo tauri build
|
||||
|
||||
- name: Upload artifacts
|
||||
if: ${{ !env.ACT }}
|
||||
uses: actions/upload-artifact@v2
|
||||
with:
|
||||
name: mediarepo-ui-${{ runner.os }}-release
|
||||
path: |
|
||||
src-tauri/target/release/bundle
|
||||
src-tauri/target/release/mediarepo-ui*
|
||||
@ -0,0 +1,90 @@
|
||||
use crate::dao::tag::{map_tag_dto, TagDao};
|
||||
use crate::dto::TagDto;
|
||||
use mediarepo_core::error::RepoResult;
|
||||
use mediarepo_core::itertools::Itertools;
|
||||
use mediarepo_database::entities::{content_descriptor, content_descriptor_tag, namespace, tag};
|
||||
use sea_orm::prelude::*;
|
||||
use std::collections::HashMap;
|
||||
|
||||
impl TagDao {
|
||||
#[tracing::instrument(level = "debug", skip(self, cds))]
|
||||
pub async fn all_for_cds_map(
|
||||
&self,
|
||||
cds: Vec<Vec<u8>>,
|
||||
) -> RepoResult<HashMap<Vec<u8>, Vec<TagDto>>> {
|
||||
let mut cd_tag_map = cds
|
||||
.iter()
|
||||
.cloned()
|
||||
.map(|cd| (cd, Vec::new()))
|
||||
.collect::<HashMap<Vec<u8>, Vec<TagDto>>>();
|
||||
|
||||
let tag_cd_entries = tags_for_cds(&self.ctx.db, cds).await?;
|
||||
|
||||
let tag_ids: Vec<i64> = tag_cd_entries
|
||||
.iter()
|
||||
.map(|(t, _)| t.tag_id)
|
||||
.unique()
|
||||
.collect();
|
||||
|
||||
let tags = tags_for_tag_ids(&self.ctx.db, tag_ids).await?;
|
||||
|
||||
let tag_id_map = tags
|
||||
.into_iter()
|
||||
.map(|t| (t.id(), t))
|
||||
.collect::<HashMap<i64, TagDto>>();
|
||||
let existing_cds_with_tags = create_cd_tag_map(tag_cd_entries, tag_id_map);
|
||||
cd_tag_map.extend(existing_cds_with_tags.into_iter());
|
||||
|
||||
Ok(cd_tag_map)
|
||||
}
|
||||
}
|
||||
|
||||
async fn tags_for_cds(
|
||||
db: &DatabaseConnection,
|
||||
cds: Vec<Vec<u8>>,
|
||||
) -> RepoResult<
|
||||
Vec<(
|
||||
content_descriptor_tag::Model,
|
||||
Option<content_descriptor::Model>,
|
||||
)>,
|
||||
> {
|
||||
let tag_cd_entries = content_descriptor_tag::Entity::find()
|
||||
.find_also_related(content_descriptor::Entity)
|
||||
.filter(content_descriptor::Column::Descriptor.is_in(cds))
|
||||
.all(db)
|
||||
.await?;
|
||||
|
||||
Ok(tag_cd_entries)
|
||||
}
|
||||
|
||||
async fn tags_for_tag_ids(db: &DatabaseConnection, ids: Vec<i64>) -> RepoResult<Vec<TagDto>> {
|
||||
let tags = tag::Entity::find()
|
||||
.find_also_related(namespace::Entity)
|
||||
.filter(tag::Column::Id.is_in(ids))
|
||||
.all(db)
|
||||
.await?
|
||||
.into_iter()
|
||||
.map(map_tag_dto)
|
||||
.collect();
|
||||
|
||||
Ok(tags)
|
||||
}
|
||||
|
||||
fn create_cd_tag_map(
|
||||
tag_cd_entries: Vec<(
|
||||
content_descriptor_tag::Model,
|
||||
Option<content_descriptor::Model>,
|
||||
)>,
|
||||
tag_id_map: HashMap<i64, TagDto>,
|
||||
) -> HashMap<Vec<u8>, Vec<TagDto>> {
|
||||
let cd_tag_map = tag_cd_entries
|
||||
.into_iter()
|
||||
.filter_map(|(t, cd)| Some((cd?, tag_id_map.get(&t.tag_id)?.clone())))
|
||||
.sorted_by_key(|(cd, _)| cd.id)
|
||||
.group_by(|(cd, _)| cd.descriptor.to_owned())
|
||||
.into_iter()
|
||||
.map(|(key, group)| (key, group.map(|(_, t)| t).collect::<Vec<TagDto>>()))
|
||||
.collect();
|
||||
|
||||
cd_tag_map
|
||||
}
|
||||
Loading…
Reference in New Issue