diff --git a/.github/workflows/create-release.yml b/.github/workflows/create-release.yml index 5687efe..f5339aa 100644 --- a/.github/workflows/create-release.yml +++ b/.github/workflows/create-release.yml @@ -136,7 +136,7 @@ jobs: notes.append(pr_match.group(1).strip()) # Parse metainfo.xml - metainfo_path = "resources/io.github.cosmicutils.camera.metainfo.xml" + metainfo_path = "resources/io.github.cosmic_utils.camera.metainfo.xml" # Register namespace to avoid ns0 prefix ET.register_namespace('', '') @@ -207,7 +207,7 @@ jobs: git config user.email "github-actions[bot]@users.noreply.github.com" git add Cargo.toml - git add resources/io.github.cosmicutils.camera.metainfo.xml + git add resources/io.github.cosmic_utils.camera.metainfo.xml git add cargo-sources.json if git diff --staged --quiet; then diff --git a/.github/workflows/update-flatpak-runtime.yml b/.github/workflows/update-flatpak-runtime.yml index 68ffdaa..3fb28a4 100644 --- a/.github/workflows/update-flatpak-runtime.yml +++ b/.github/workflows/update-flatpak-runtime.yml @@ -27,7 +27,7 @@ jobs: id: check run: | # Get current runtime version from manifest - CURRENT_VERSION=$(grep -oP "runtime-version:\s*'\K[^']+" io.github.cosmicutils.camera.yml) + CURRENT_VERSION=$(grep -oP "runtime-version:\s*'\K[^']+" io.github.cosmic_utils.camera.yml) echo "Current runtime version: $CURRENT_VERSION" echo "current=$CURRENT_VERSION" >> $GITHUB_OUTPUT @@ -65,10 +65,10 @@ jobs: LATEST="${{ steps.check.outputs.latest }}" # Update runtime-version in the manifest - sed -i "s/runtime-version: '$CURRENT'/runtime-version: '$LATEST'/" io.github.cosmicutils.camera.yml + sed -i "s/runtime-version: '$CURRENT'/runtime-version: '$LATEST'/" io.github.cosmic_utils.camera.yml echo "Updated manifest:" - grep "runtime-version" io.github.cosmicutils.camera.yml + grep "runtime-version" io.github.cosmic_utils.camera.yml - name: Create Pull Request if: steps.check.outputs.update_available == 'true' @@ -83,7 +83,7 @@ jobs: Updates `org.freedesktop.Platform` and `org.freedesktop.Sdk` from `${{ steps.check.outputs.current }}` to `${{ steps.check.outputs.latest }}`. ### Changes - - Updated `runtime-version` in `io.github.cosmicutils.camera.yml` + - Updated `runtime-version` in `io.github.cosmic_utils.camera.yml` ### Testing - [ ] Build Flatpak locally with `just flatpak-install` diff --git a/Cargo.lock b/Cargo.lock index 79b2eb7..17d4d92 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -926,7 +926,7 @@ dependencies = [ [[package]] name = "camera" -version = "0.1.15" +version = "0.1.16" dependencies = [ "bytemuck", "chrono", diff --git a/README.md b/README.md index 06b9c55..2140c7d 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Camera -[![Flathub](https://img.shields.io/flathub/v/io.github.cosmicutils.camera?logo=flathub&logoColor=white)](https://flathub.org/apps/io.github.cosmicutils.camera) +[![Flathub](https://img.shields.io/flathub/v/io.github.cosmic_utils.camera?logo=flathub&logoColor=white)](https://flathub.org/apps/io.github.cosmic_utils.camera) [![CI](https://github.com/cosmic-utils/camera/actions/workflows/ci.yml/badge.svg)](https://github.com/cosmic-utils/camera/actions/workflows/ci.yml) [![Release](https://github.com/cosmic-utils/camera/actions/workflows/release.yml/badge.svg)](https://github.com/cosmic-utils/camera/actions/workflows/release.yml) @@ -18,11 +18,11 @@ This is a personal project by [Frederic Laing](https://github.com/FreddyFunk). I ### Flatpak (Recommended) -Get it on Flathub +Get it on Flathub ```bash # Install from Flathub -flatpak install flathub io.github.cosmicutils.camera +flatpak install flathub io.github.cosmic_utils.camera # Or install from a downloaded .flatpak bundle flatpak install camera-x86_64.flatpak diff --git a/RELEASE.md b/RELEASE.md index c27d3c2..528f838 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -64,7 +64,7 @@ No additional setup required. The workflow uses the default `GITHUB_TOKEN`. The `FLATHUB_TOKEN` secret must be configured in the repository settings: 1. Create a GitHub Personal Access Token with `repo` scope -2. The token must have write access to the [flathub/io.github.cosmicutils.camera](https://github.com/flathub/io.github.cosmicutils.camera) repository +2. The token must have write access to the [flathub/io.github.cosmic_utils.camera](https://github.com/flathub/io.github.cosmic_utils.camera) repository 3. Add it as a repository secret named `FLATHUB_TOKEN` If the secret is not set, the Flathub publishing step will be skipped. @@ -82,7 +82,7 @@ Release notes are generated from merged pull requests. If there are no PRs since ### Flathub Build Fails If the Flathub build fails after publishing: -1. Check the [Flathub Buildbot](https://buildbot.flathub.org/#/apps/io.github.cosmicutils.camera) +1. Check the [Flathub Buildbot](https://buildbot.flathub.org/#/apps/io.github.cosmic_utils.camera) 2. Common issues: missing dependencies, cargo source hash mismatches 3. You may need to manually fix the Flathub repository @@ -93,7 +93,7 @@ If the automated workflow fails, you can create a release manually: ```bash # 1. Update metainfo.xml manually with the new version and date # 2. Commit the change -git add resources/io.github.cosmicutils.camera.metainfo.xml +git add resources/io.github.cosmic_utils.camera.metainfo.xml git commit -m "Release v0.1.7: update metainfo.xml" git push origin main diff --git a/io.github.cosmicutils.camera.yml b/io.github.cosmic_utils.camera.yml similarity index 76% rename from io.github.cosmicutils.camera.yml rename to io.github.cosmic_utils.camera.yml index 25152ab..2364263 100644 --- a/io.github.cosmicutils.camera.yml +++ b/io.github.cosmic_utils.camera.yml @@ -1,4 +1,4 @@ -app-id: io.github.cosmicutils.camera +app-id: io.github.cosmic_utils.camera runtime: org.freedesktop.Platform runtime-version: '25.08' sdk: org.freedesktop.Sdk @@ -49,18 +49,18 @@ modules: # Install the binary - install -Dm755 target/release/camera -t /app/bin/ # Install desktop file - - install -Dm644 resources/io.github.cosmicutils.camera.desktop -t /app/share/applications/ + - install -Dm644 resources/io.github.cosmic_utils.camera.desktop -t /app/share/applications/ # Install icons (PNG for each size, SVG for scalable) - - install -Dm644 resources/icons/hicolor/scalable/apps/io.github.cosmicutils.camera.svg -t /app/share/icons/hicolor/scalable/apps/ - - install -Dm644 resources/icons/hicolor/16x16/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/16x16/apps/ - - install -Dm644 resources/icons/hicolor/24x24/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/24x24/apps/ - - install -Dm644 resources/icons/hicolor/32x32/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/32x32/apps/ - - install -Dm644 resources/icons/hicolor/48x48/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/48x48/apps/ - - install -Dm644 resources/icons/hicolor/64x64/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/64x64/apps/ - - install -Dm644 resources/icons/hicolor/128x128/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/128x128/apps/ - - install -Dm644 resources/icons/hicolor/256x256/apps/io.github.cosmicutils.camera.png -t /app/share/icons/hicolor/256x256/apps/ + - install -Dm644 resources/icons/hicolor/scalable/apps/io.github.cosmic_utils.camera.svg -t /app/share/icons/hicolor/scalable/apps/ + - install -Dm644 resources/icons/hicolor/16x16/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/16x16/apps/ + - install -Dm644 resources/icons/hicolor/24x24/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/24x24/apps/ + - install -Dm644 resources/icons/hicolor/32x32/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/32x32/apps/ + - install -Dm644 resources/icons/hicolor/48x48/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/48x48/apps/ + - install -Dm644 resources/icons/hicolor/64x64/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/64x64/apps/ + - install -Dm644 resources/icons/hicolor/128x128/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/128x128/apps/ + - install -Dm644 resources/icons/hicolor/256x256/apps/io.github.cosmic_utils.camera.png -t /app/share/icons/hicolor/256x256/apps/ # Install metainfo - - install -Dm644 resources/io.github.cosmicutils.camera.metainfo.xml -t /app/share/metainfo/ + - install -Dm644 resources/io.github.cosmic_utils.camera.metainfo.xml -t /app/share/metainfo/ sources: - type: dir path: . diff --git a/justfile b/justfile index b875e94..6149204 100644 --- a/justfile +++ b/justfile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-3.0-only name := 'camera' -export APPID := 'io.github.cosmicutils.camera' +export APPID := 'io.github.cosmic_utils.camera' rootdir := '' prefix := '/usr' diff --git a/resources/icons/hicolor/128x128/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/128x128/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/128x128/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/128x128/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/16x16/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/16x16/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/16x16/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/16x16/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/24x24/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/24x24/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/24x24/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/24x24/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/256x256/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/256x256/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/256x256/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/256x256/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/32x32/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/32x32/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/32x32/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/32x32/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/48x48/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/48x48/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/48x48/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/48x48/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/64x64/apps/io.github.cosmicutils.camera.png b/resources/icons/hicolor/64x64/apps/io.github.cosmic_utils.camera.png similarity index 100% rename from resources/icons/hicolor/64x64/apps/io.github.cosmicutils.camera.png rename to resources/icons/hicolor/64x64/apps/io.github.cosmic_utils.camera.png diff --git a/resources/icons/hicolor/scalable/apps/io.github.cosmicutils.camera.svg b/resources/icons/hicolor/scalable/apps/io.github.cosmic_utils.camera.svg similarity index 100% rename from resources/icons/hicolor/scalable/apps/io.github.cosmicutils.camera.svg rename to resources/icons/hicolor/scalable/apps/io.github.cosmic_utils.camera.svg diff --git a/resources/io.github.cosmicutils.camera.desktop b/resources/io.github.cosmic_utils.camera.desktop similarity index 89% rename from resources/io.github.cosmicutils.camera.desktop rename to resources/io.github.cosmic_utils.camera.desktop index 0a3d88e..7351f8d 100644 --- a/resources/io.github.cosmicutils.camera.desktop +++ b/resources/io.github.cosmic_utils.camera.desktop @@ -3,7 +3,7 @@ Type=Application Name=Camera GenericName=Camera Comment=Third-party camera app for the COSMIC™ desktop -Icon=io.github.cosmicutils.camera +Icon=io.github.cosmic_utils.camera Exec=camera Terminal=false Categories=AudioVideo;Video;Recorder;Photography; diff --git a/resources/io.github.cosmicutils.camera.metainfo.xml b/resources/io.github.cosmic_utils.camera.metainfo.xml similarity index 97% rename from resources/io.github.cosmicutils.camera.metainfo.xml rename to resources/io.github.cosmic_utils.camera.metainfo.xml index dd864f1..7a97436 100644 --- a/resources/io.github.cosmicutils.camera.metainfo.xml +++ b/resources/io.github.cosmic_utils.camera.metainfo.xml @@ -1,6 +1,6 @@ - io.github.cosmicutils.camera + io.github.cosmic_utils.camera CC0-1.0 GPL-3.0-only Camera @@ -26,14 +26,14 @@
  • Multi-camera support: easily switch between cameras and microphones
    • - io.github.cosmicutils.camera.desktop + io.github.cosmic_utils.camera.desktop camera https://github.com/cosmic-utils/camera https://github.com/cosmic-utils/camera/issues https://github.com/cosmic-utils/camera - + Frederic Laing @@ -99,7 +99,7 @@

    Release 0.1.13 includes the following changes:

    • clearly clarify this as a third party app for COSMIC DE according to the trademark
      • -
    • migrate app from io.github.freddyfunk.camera to io.github.cosmicutils.camera
      • +
    • migrate app from io.github.freddyfunk.camera to io.github.cosmic_utils.camera
    • deps(cargo): bump rfd from 0.15.4 to 0.16.0
    • deps(cargo): bump crossterm from 0.28.1 to 0.29.0
    diff --git a/src/app/mod.rs b/src/app/mod.rs index d7633d1..7c7d6db 100644 --- a/src/app/mod.rs +++ b/src/app/mod.rs @@ -78,7 +78,7 @@ const REPOSITORY: &str = "https://github.com/cosmic-utils/camera"; /// App icon SVG for the about page (scalable, non-pixelated) const APP_ICON: &[u8] = - include_bytes!("../../resources/icons/hicolor/scalable/apps/io.github.cosmicutils.camera.svg"); + include_bytes!("../../resources/icons/hicolor/scalable/apps/io.github.cosmic_utils.camera.svg"); impl cosmic::Application for AppModel { /// The async executor that will be used to run your application's commands. @@ -91,7 +91,7 @@ impl cosmic::Application for AppModel { type Message = Message; /// Unique identifier in RDNN (reverse domain name notation) format. - const APP_ID: &'static str = "io.github.cosmicutils.camera"; + const APP_ID: &'static str = "io.github.cosmic_utils.camera"; fn core(&self) -> &cosmic::Core { &self.core