Skip to content
Open
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
23 changes: 19 additions & 4 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
## v3.0.1
## v3.0.14

Changes since v3.0.0:
* fix(core): resolve variable shadowing in magic mount execution
* chore(release): bump version to v3.0.0 [skip ci]
Changes since v3.0.12:
* chore: bump to v3.0.14
* chore: bump to v3.0.12
* chore: make cargo clippy happy
* xtask: refactor version retrieval
* feat: Add directory review
* opt: Optimize umount logic
* chore: removed useless code
* feat: Avoid duplicate commits and umounts
* feat: Avoid having the same subdirectory and parent directory during umount.
* refactor(core/storage): unify stale image cleanup logic
* refactor(overlayfs): implement hierarchical mounting to bypass layer limits
* chore: completely remove backup
* xtask: dropped ksusig
* xtask: fix pnpm command error
* Revert "feat: drop armv7 surpport"
* workflow: remove ksusig
* fix: fix pnpm build
4 changes: 2 additions & 2 deletions module/module.prop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
id=meta-hybrid
metamodule=1
name=Hybrid Mount
version=v3.0.1
versionCode=144
version=v3.0.14
versionCode=148
author=Hybrid Mount Developers
updateJson=https://raw.githubusercontent.com/YuzakiKokuban/meta-hybrid_mount/master/update.json
description=Waiting for daemon...
Binary file modified notify
Binary file not shown.
14 changes: 8 additions & 6 deletions src/core/storage.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,14 +119,16 @@ pub fn setup(
disable_umount: bool,
) -> Result<StorageHandle> {
if img_path.exists()
&& let Err(e) = fs::remove_file(img_path) {
log::warn!("Failed to remove old ext4 image: {}", e);
}
&& let Err(e) = fs::remove_file(img_path)
{
log::warn!("Failed to remove old ext4 image: {}", e);
}
let erofs_path = img_path.with_extension("erofs");
if erofs_path.exists()
&& let Err(e) = fs::remove_file(&erofs_path) {
log::warn!("Failed to remove old erofs image: {}", e);
}
&& let Err(e) = fs::remove_file(&erofs_path)
{
log::warn!("Failed to remove old erofs image: {}", e);
}

if is_mounted(mnt_base) {
let _ = umount(mnt_base, UnmountFlags::DETACH);
Expand Down
8 changes: 4 additions & 4 deletions tools/notify/Cargo.lock

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

4 changes: 2 additions & 2 deletions tools/notify/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ edition = "2024"
[workspace]

[dependencies]
anyhow = "1.0.101"
anyhow = "1.0.102"
serde_json = "1.0.149"
tgbot = "0.41.0"
tgbot = "0.42.0"
tokio = { version = "1.49.0", features = ["full"] }
6 changes: 3 additions & 3 deletions update.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"version": "v3.0.1",
"versionCode": 144,
"zipUrl": "https://github.com/Hybrid-Mount/meta-hybrid_mount/releases/download/v3.0.1/Meta-Hybrid-v3.0.1.zip",
"version": "v3.0.14",
"versionCode": 148,
"zipUrl": "https://github.com/Hybrid-Mount/meta-hybrid_mount/releases/download/v3.0.14/Meta-Hybrid-3.0.14-1176.zip",
"changelog": "https://raw.githubusercontent.com/Hybrid-Mount/meta-hybrid_mount/master/changelog.md"
}
1 change: 1 addition & 0 deletions webui/src/lib/constants_gen.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,3 +8,4 @@ export const RUST_PATHS = {
DAEMON_LOG: "/data/adb/meta-hybrid/daemon.log",
} as const;
export const BUILTIN_PARTITIONS = ["system", "vendor", "product", "system_ext", "odm", "oem", "apex"] as const;
export const IS_RELEASE = false;
9 changes: 4 additions & 5 deletions webui/src/routes/InfoTab.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
* SPDX-License-Identifier: GPL-3.0-or-later
*/

import { createSignal, onMount, Show, For, createMemo } from "solid-js";
import { createSignal, onMount, Show, For } from "solid-js";
import { store } from "../lib/store";
import { API } from "../lib/api";
import { ICONS } from "../lib/constants";
import { IS_RELEASE } from "../lib/constants_gen";
import "./InfoTab.css";
import Skeleton from "../components/Skeleton";
import "@material/web/button/filled-tonal-button.js";
Expand Down Expand Up @@ -48,9 +49,7 @@ export default function InfoTab() {
let donateDialogRef: HTMLElement | undefined;
let qrDialogRef: HTMLElement | undefined;

const isDev = createMemo(() => {
return !/^v\d+\.\d+\.\d+$/.test(version());
});
const isDev = () => !IS_RELEASE;

onMount(async () => {
try {
Expand Down Expand Up @@ -391,4 +390,4 @@ export default function InfoTab() {
</md-dialog>
</div>
);
}
}
9 changes: 5 additions & 4 deletions xtask/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ fn build_full(release: bool, skip_webui: bool, target_arch: Option<Arch>) -> Res
let version = get_version()?;
if !skip_webui {
println!(":: Building WebUI...");
build_webui(&version)?;
build_webui(&version, release)?;
}

let archs_to_build = if let Some(selected) = target_arch {
Expand Down Expand Up @@ -173,8 +173,8 @@ fn build_full(release: bool, skip_webui: bool, target_arch: Option<Arch>) -> Res
Ok(())
}

fn build_webui(version: &str) -> Result<()> {
generate_webui_constants(version)?;
fn build_webui(version: &str, is_release: bool) -> Result<()> {
generate_webui_constants(version, is_release)?;
let webui_dir = Path::new("webui");
let pnpm = if cfg!(windows) { "pnpm.cmd" } else { "pnpm" };
let status = Command::new(pnpm)
Expand All @@ -194,11 +194,12 @@ fn build_webui(version: &str) -> Result<()> {
Ok(())
}

fn generate_webui_constants(version: &str) -> Result<()> {
fn generate_webui_constants(version: &str, is_release: bool) -> Result<()> {
let path = Path::new("webui/src/lib/constants_gen.ts");
let content = format!(
r#"
export const APP_VERSION = "{version}";
export const IS_RELEASE = {is_release};
export const RUST_PATHS = {{
CONFIG: "/data/adb/meta-hybrid/config.toml",
MODE_CONFIG: "/data/adb/meta-hybrid/module_mode.conf",
Expand Down