From 43685be977762c773766e71ccc211293d9a7aac2 Mon Sep 17 00:00:00 2001
From: Sumner Evans <me@sumnerevans.com>
Date: Sat, 11 Jul 2020 13:01:54 -0600
Subject: [PATCH] Use app.sublimemusic.SublimeMusic as app ID

---
 CONTRIBUTING.rst                                           | 2 +-
 README.rst                                                 | 7 ++++++-
 docs/index.rst                                             | 2 +-
 ...ublimeMusic.json => app.sublimemusic.SublimeMusic.json} | 2 +-
 flatpak/flatpak_build.sh                                   | 5 +++--
 sublime-music.metainfo.xml                                 | 2 +-
 sublime/adapters/adapter_base.py                           | 2 +-
 sublime/app.py                                             | 2 +-
 8 files changed, 15 insertions(+), 9 deletions(-)
 rename flatpak/{com.sumnerevans.SublimeMusic.json => app.sublimemusic.SublimeMusic.json} (99%)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 41b2813..c0f8faf 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -89,7 +89,7 @@ Building the flatpak
 - The script ``flatpak_build.sh`` will run the required commands to grab the
   remaining dependencies and build the flatpak.
 - You can install the Flatpak using: ``flatpak install sublime-music.flatpak``
-  and run it using ``flatpak run com.sumnerevans.SublimeMusic``.
+  and run it using ``flatpak run app.sublimemusic.SublimeMusic``.
 
 Code Style
 ----------
diff --git a/README.rst b/README.rst
index eb77719..e59173f 100644
--- a/README.rst
+++ b/README.rst
@@ -76,7 +76,7 @@ Then, you can install Sublime Music with::
 
 and run it by executing::
 
-    flatpak run com.sumnerevans.SublimeMusic
+    flatpak run app.sublimemusic.SublimeMusic
 
 .. _Releases: https://gitlab.com/sublime-music/sublime-music/-/releases
 
@@ -104,6 +104,11 @@ how to do that::
 
 -------------------------------------------------------------------------------
 
+|website|_
+
+.. |website| replace:: **Click HERE for the Sublime Music website.**
+.. _website: https://sublimemusic.app
+
 |userdoc|_
 
 .. |userdoc| replace:: **Click HERE for extended user documentation.**
diff --git a/docs/index.rst b/docs/index.rst
index 92b00e4..72815af 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -80,7 +80,7 @@ Then, you can install Sublime Music with::
 
 and run it by executing::
 
-    flatpak run com.sumnerevans.SublimeMusic
+    flatpak run app.sublimemusic.SublimeMusic
 
 .. _Releases: https://gitlab.com/sublime-music/sublime-music/-/releases
 
diff --git a/flatpak/com.sumnerevans.SublimeMusic.json b/flatpak/app.sublimemusic.SublimeMusic.json
similarity index 99%
rename from flatpak/com.sumnerevans.SublimeMusic.json
rename to flatpak/app.sublimemusic.SublimeMusic.json
index 0fb5bd0..952497f 100644
--- a/flatpak/com.sumnerevans.SublimeMusic.json
+++ b/flatpak/app.sublimemusic.SublimeMusic.json
@@ -1,5 +1,5 @@
 {
-  "app-id": "com.sumnerevans.SublimeMusic",
+  "app-id": "app.sublimemusic.SublimeMusic",
   "runtime": "org.gnome.Platform",
   "runtime-version": "3.34",
   "sdk": "org.gnome.Sdk",
diff --git a/flatpak/flatpak_build.sh b/flatpak/flatpak_build.sh
index 8d415fd..294dbff 100755
--- a/flatpak/flatpak_build.sh
+++ b/flatpak/flatpak_build.sh
@@ -3,6 +3,7 @@
 set -xe
 
 REPO=${REPO:-/repo}
+APPID=app.sublimemusic.SublimeMusic
 
 rm -rf flatpak-builder-tools
 git clone https://github.com/flatpak/flatpak-builder-tools.git
@@ -13,6 +14,6 @@ python3 ./flatpak-builder-tools/pip/flatpak-pip-generator \
 
 mkdir -p $REPO
 
-flatpak-builder --force-clean --repo=$REPO flatpak_build_dir com.sumnerevans.SublimeMusic.json
+flatpak-builder --force-clean --repo=$REPO flatpak_build_dir ${APPID}.json
 
-flatpak build-bundle $REPO sublime-music.flatpak com.sumnerevans.SublimeMusic
+flatpak build-bundle $REPO sublime-music.flatpak $APPID
diff --git a/sublime-music.metainfo.xml b/sublime-music.metainfo.xml
index 90018a6..5af2160 100644
--- a/sublime-music.metainfo.xml
+++ b/sublime-music.metainfo.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2020 Sumner Evans -->
 <component type="desktop-application">
-    <id>com.sumnerevans.SublimeMusic</id>
+    <id>app.sublimemusic.SublimeMusic</id>
     <metadata_license>FSFAP</metadata_license>
     <project_license>GPL-3.0+</project_license>
     <name>Sublime Music</name>
diff --git a/sublime/adapters/adapter_base.py b/sublime/adapters/adapter_base.py
index de9fb69..01cf6f0 100644
--- a/sublime/adapters/adapter_base.py
+++ b/sublime/adapters/adapter_base.py
@@ -162,7 +162,7 @@ class CacheMissError(Exception):
         super().__init__(*args)
 
 
-KEYRING_APP_NAME = "com.sumnerevans.SublimeMusic"
+KEYRING_APP_NAME = "app.sublimemusic.SublimeMusic"
 
 
 class ConfigurationStore(dict):
diff --git a/sublime/app.py b/sublime/app.py
index 6796b1f..d10c2ab 100644
--- a/sublime/app.py
+++ b/sublime/app.py
@@ -50,7 +50,7 @@ from .ui.state import RepeatType, UIState
 
 class SublimeMusicApp(Gtk.Application):
     def __init__(self, config_file: Path):
-        super().__init__(application_id="com.sumnerevans.sublimemusic")
+        super().__init__(application_id="app.sublimemusic.SublimeMusic")
         if glib_notify_exists:
             Notify.init("Sublime Music")