Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/create-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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('', '')
Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/update-flatpak-runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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'
Expand All @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -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)

Expand All @@ -18,11 +18,11 @@ This is a personal project by [Frederic Laing](https://github.com/FreddyFunk). I

### Flatpak (Recommended)

<a href='https://flathub.org/apps/io.github.cosmicutils.camera'><img width='240' alt='Get it on Flathub' src='https://flathub.org/api/badge?svg&locale=en'/></a>
<a href='https://flathub.org/apps/io.github.cosmic_utils.camera'><img width='240' alt='Get it on Flathub' src='https://flathub.org/api/badge?svg&locale=en'/></a>

```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
Expand Down
6 changes: 3 additions & 3 deletions RELEASE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand All @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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: .
Expand Down
2 changes: 1 addition & 1 deletion justfile
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<component type="desktop-application">
<id>io.github.cosmicutils.camera</id>
<id>io.github.cosmic_utils.camera</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0-only</project_license>
<name>Camera</name>
Expand All @@ -26,14 +26,14 @@
<li>Multi-camera support: easily switch between cameras and microphones</li>
</ul>
</description>
<launchable type="desktop-id">io.github.cosmicutils.camera.desktop</launchable>
<launchable type="desktop-id">io.github.cosmic_utils.camera.desktop</launchable>
<provides>
<binary>camera</binary>
</provides>
<url type="homepage">https://github.com/cosmic-utils/camera</url>
<url type="bugtracker">https://github.com/cosmic-utils/camera/issues</url>
<url type="vcs-browser">https://github.com/cosmic-utils/camera</url>
<developer id="io.github.cosmicutils">
<developer id="io.github.cosmic_utils">
<name>Frederic Laing</name>
</developer>
<content_rating type="oars-1.1" />
Expand Down Expand Up @@ -99,7 +99,7 @@
<p>Release 0.1.13 includes the following changes:</p>
<ul>
<li>clearly clarify this as a third party app for COSMIC DE according to the trademark</li>
<li>migrate app from io.github.freddyfunk.camera to io.github.cosmicutils.camera</li>
<li>migrate app from io.github.freddyfunk.camera to io.github.cosmic_utils.camera</li>
<li>deps(cargo): bump rfd from 0.15.4 to 0.16.0</li>
<li>deps(cargo): bump crossterm from 0.28.1 to 0.29.0</li>
</ul>
Expand Down
4 changes: 2 additions & 2 deletions src/app/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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
Expand Down
Loading