forked from Blendman974/faceclaw
Add source-filtering to Music app, to exclude "media sessions" from apps that aren't really media players
This commit is contained in:
1 parent
813668f850
commit
78c56ffc4e
7 files changed
+237
-3
No files matched your search
@@ -0,0 +1,83 @@
|
||||
import { getStringSetting, setStringSetting } from "./settings-store";
|
||||
|
||||
export const MEDIA_APPS_KEY = "music.apps";
|
||||
|
||||
// Exact package IDs only: browsers, social feeds and messaging apps commonly
|
||||
// publish sessions for embedded clips. Users can explicitly enable any of them.
|
||||
export const DEFAULT_IGNORED_MEDIA_APPS: readonly string[] = [
|
||||
"com.android.chrome",
|
||||
"org.mozilla.firefox",
|
||||
"com.microsoft.emmx",
|
||||
"com.sec.android.app.sbrowser",
|
||||
"com.facebook.katana",
|
||||
"com.facebook.orca",
|
||||
"com.instagram.android",
|
||||
"com.whatsapp",
|
||||
"org.telegram.messenger",
|
||||
"com.snapchat.android",
|
||||
"com.reddit.frontpage",
|
||||
"com.twitter.android",
|
||||
"com.discord",
|
||||
];
|
||||
|
||||
export type MediaApp = {
|
||||
packageName: string;
|
||||
appName: string;
|
||||
/** Absent until the user chooses; built-in defaults can evolve independently. */
|
||||
enabled?: boolean;
|
||||
};
|
||||
|
||||
/** Keep discovered apps after their sessions end, including ignored apps. */
|
||||
export function readMediaApps(): MediaApp[] {
|
||||
try {
|
||||
const parsed = JSON.parse(getStringSetting(MEDIA_APPS_KEY, "[]"));
|
||||
if (!Array.isArray(parsed)) return [];
|
||||
const apps = new Map<string, MediaApp>();
|
||||
for (const app of parsed) {
|
||||
if (!app || typeof app.packageName !== "string" || !app.packageName) continue;
|
||||
apps.set(app.packageName, {
|
||||
packageName: app.packageName,
|
||||
appName: typeof app.appName === "string" && app.appName ? app.appName : app.packageName,
|
||||
...(typeof app.enabled === "boolean" ? { enabled: app.enabled } : {}),
|
||||
});
|
||||
}
|
||||
return Array.from(apps.values());
|
||||
} catch {
|
||||
return [];
|
||||
}
|
||||
}
|
||||
|
||||
export function rememberMediaApps(discovered: { packageName: string; appName: string }[]): void {
|
||||
const apps = new Map(readMediaApps().map((app) => [app.packageName, app]));
|
||||
let changed = false;
|
||||
for (const app of discovered) {
|
||||
if (!app.packageName) continue;
|
||||
const previous = apps.get(app.packageName);
|
||||
const appName = app.appName || previous?.appName || app.packageName;
|
||||
if (!previous || previous.appName !== appName) {
|
||||
apps.set(app.packageName, { ...previous, packageName: app.packageName, appName });
|
||||
changed = true;
|
||||
}
|
||||
}
|
||||
if (changed) setStringSetting(MEDIA_APPS_KEY, JSON.stringify(Array.from(apps.values())));
|
||||
}
|
||||
|
||||
export function ignoredMediaPackages(): string[] {
|
||||
const ignored = new Set(DEFAULT_IGNORED_MEDIA_APPS);
|
||||
for (const app of readMediaApps()) {
|
||||
if (app.enabled === true) ignored.delete(app.packageName);
|
||||
else if (app.enabled === false) ignored.add(app.packageName);
|
||||
}
|
||||
return Array.from(ignored).sort();
|
||||
}
|
||||
|
||||
export function isMediaAppEnabled(packageName: string): boolean {
|
||||
return !ignoredMediaPackages().includes(packageName);
|
||||
}
|
||||
|
||||
export function setMediaAppEnabled(app: MediaApp, enabled: boolean): void {
|
||||
if (!app.packageName) return;
|
||||
const apps = new Map(readMediaApps().map((item) => [item.packageName, item]));
|
||||
apps.set(app.packageName, { packageName: app.packageName, appName: app.appName || app.packageName, enabled });
|
||||
setStringSetting(MEDIA_APPS_KEY, JSON.stringify(Array.from(apps.values())));
|
||||
}
|
||||
@@ -1,4 +1,6 @@
|
||||
import { Utils } from "@nativescript/core";
|
||||
import { ignoredMediaPackages, isMediaAppEnabled, MEDIA_APPS_KEY, rememberMediaApps } from "./media-apps";
|
||||
import { onSettingsStoreChanged } from "./settings-store";
|
||||
|
||||
declare const com: any;
|
||||
|
||||
@@ -34,11 +36,12 @@ export class FaceclawMediaBrowserBridge {
|
||||
private readonly pendingConnects = new Map<number, PendingRequest<string>>();
|
||||
private readonly pendingBrowses = new Map<number, PendingRequest<MediaBrowseItem[]>>();
|
||||
private appsCache: MediaBrowserApp[] | null = null;
|
||||
private connectedPackage = "";
|
||||
|
||||
/** Installed apps exposing a media browser service; cached after the first call. */
|
||||
listBrowsableApps(refresh = false): MediaBrowserApp[] {
|
||||
if (!global.isAndroid) return [];
|
||||
if (this.appsCache && !refresh) return this.appsCache;
|
||||
if (this.appsCache && !refresh) return this.enabledApps();
|
||||
this.ensureBrowser();
|
||||
if (!this.browser) return [];
|
||||
try {
|
||||
@@ -52,11 +55,17 @@ export class FaceclawMediaBrowserBridge {
|
||||
serviceClass: String(app.serviceClass ?? ""),
|
||||
appName: String(app.appName ?? ""),
|
||||
}));
|
||||
rememberMediaApps(this.appsCache);
|
||||
} catch (error) {
|
||||
console.warn(`media browser app list parse failed: ${error}`);
|
||||
this.appsCache = [];
|
||||
}
|
||||
return this.appsCache;
|
||||
return this.enabledApps();
|
||||
}
|
||||
|
||||
private enabledApps(): MediaBrowserApp[] {
|
||||
const ignored = new Set(ignoredMediaPackages());
|
||||
return (this.appsCache ?? []).filter((app) => !ignored.has(app.packageName));
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -65,9 +74,11 @@ export class FaceclawMediaBrowserBridge {
|
||||
*/
|
||||
connect(app: MediaBrowserApp): Promise<string> {
|
||||
if (!global.isAndroid) return Promise.reject(new Error("Android only"));
|
||||
if (!isMediaAppEnabled(app.packageName)) return Promise.reject(new Error("App is ignored in Music settings"));
|
||||
this.ensureBrowser();
|
||||
if (!this.browser) return Promise.reject(new Error("Media browser unavailable"));
|
||||
const requestId = this.nextRequestId++;
|
||||
this.connectedPackage = app.packageName;
|
||||
return new Promise<string>((resolve, reject) => {
|
||||
this.pendingConnects.set(requestId, { resolve, reject });
|
||||
this.browser.connect(requestId, app.packageName, app.serviceClass);
|
||||
@@ -77,6 +88,10 @@ export class FaceclawMediaBrowserBridge {
|
||||
/** Fetch one level of the connected service's content tree. */
|
||||
browse(parentId: string): Promise<MediaBrowseItem[]> {
|
||||
if (!global.isAndroid) return Promise.reject(new Error("Android only"));
|
||||
if (this.connectedPackage && !isMediaAppEnabled(this.connectedPackage)) {
|
||||
this.disconnect();
|
||||
return Promise.reject(new Error("App is ignored in Music settings"));
|
||||
}
|
||||
this.ensureBrowser();
|
||||
if (!this.browser) return Promise.reject(new Error("Media browser unavailable"));
|
||||
const requestId = this.nextRequestId++;
|
||||
@@ -89,6 +104,7 @@ export class FaceclawMediaBrowserBridge {
|
||||
/** Start playback of a browsed item through the connected player's session. */
|
||||
playFromMediaId(mediaId: string): void {
|
||||
if (!global.isAndroid) return;
|
||||
if (!this.connectedPackage || !isMediaAppEnabled(this.connectedPackage)) return;
|
||||
this.browser?.playFromMediaId(mediaId);
|
||||
}
|
||||
|
||||
@@ -96,6 +112,7 @@ export class FaceclawMediaBrowserBridge {
|
||||
disconnect(): void {
|
||||
if (!global.isAndroid) return;
|
||||
this.rejectAllPending("Disconnected");
|
||||
this.connectedPackage = "";
|
||||
this.browser?.disconnect();
|
||||
}
|
||||
|
||||
@@ -115,6 +132,11 @@ export class FaceclawMediaBrowserBridge {
|
||||
throw new Error("Android application context unavailable");
|
||||
}
|
||||
this.browser = new com.faceclaw.app.FaceclawMediaBrowser(context);
|
||||
onSettingsStoreChanged((key) => {
|
||||
if (key === MEDIA_APPS_KEY && this.connectedPackage && !isMediaAppEnabled(this.connectedPackage)) {
|
||||
this.disconnect();
|
||||
}
|
||||
});
|
||||
this.listenerProxy = new com.faceclaw.app.FaceclawMediaBrowserListener({
|
||||
onConnectResult: (requestId: number, connected: boolean, rootId: string, error: string) => {
|
||||
const pending = this.pendingConnects.get(Number(requestId));
|
||||
|
||||
@@ -1,6 +1,8 @@
|
||||
import { Utils } from "@nativescript/core";
|
||||
import { GrayImage } from "../graphics/image";
|
||||
import { grayImageFromPacket, PHOTO_TONE } from "./image-files";
|
||||
import { ignoredMediaPackages, MEDIA_APPS_KEY, rememberMediaApps } from "./media-apps";
|
||||
import { onSettingsStoreChanged } from "./settings-store";
|
||||
|
||||
declare const com: any;
|
||||
|
||||
@@ -173,7 +175,22 @@ export class FaceclawMediaControllerBridge {
|
||||
throw new Error("Android application context unavailable");
|
||||
}
|
||||
this.controller = new com.faceclaw.app.FaceclawMediaController(context);
|
||||
// Install defaults and saved overrides before starting session discovery.
|
||||
this.controller.setIgnoredPackagesJson(JSON.stringify(ignoredMediaPackages()));
|
||||
onSettingsStoreChanged((key) => {
|
||||
if (key === MEDIA_APPS_KEY) {
|
||||
this.controller.setIgnoredPackagesJson(JSON.stringify(ignoredMediaPackages()));
|
||||
}
|
||||
});
|
||||
this.listenerProxy = new com.faceclaw.app.FaceclawMediaControllerListener({
|
||||
onSessionAppsChanged: (appsJson: string) => {
|
||||
try {
|
||||
const apps = JSON.parse(String(appsJson));
|
||||
rememberMediaApps(apps);
|
||||
} catch (error) {
|
||||
console.warn(`media session apps parse failed: ${error}`);
|
||||
}
|
||||
},
|
||||
onStateChange: (
|
||||
playbackState: string,
|
||||
packageName: string,
|
||||
|
||||
Reference in new issue
Block a user