mirror of
https://github.com/kunkunsh/kunkun-ext-neohtop.git
synced 2025-04-15 11:14:36 +00:00
Merge branch 'main' into fix/windows_disks
This commit is contained in:
commit
6da5d8d465
6
.github/workflows/build-check.yml
vendored
6
.github/workflows/build-check.yml
vendored
@ -78,4 +78,8 @@ jobs:
|
|||||||
run: npm ci
|
run: npm ci
|
||||||
|
|
||||||
- name: Build Application
|
- name: Build Application
|
||||||
run: npm run tauri build
|
run: |
|
||||||
|
npm run tauri build -- \
|
||||||
|
--target x86_64-unknown-linux-gnu \
|
||||||
|
--bundles deb \
|
||||||
|
--ci
|
22
.github/workflows/linux-aarch64-nightly.yml
vendored
22
.github/workflows/linux-aarch64-nightly.yml
vendored
@ -135,6 +135,15 @@ jobs:
|
|||||||
for f in *.deb; do
|
for f in *.deb; do
|
||||||
echo "AARCH64_DEB_PATH=src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/$f" >> $GITHUB_ENV
|
echo "AARCH64_DEB_PATH=src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/deb/$f" >> $GITHUB_ENV
|
||||||
done
|
done
|
||||||
|
|
||||||
|
- name: Build RPM Package
|
||||||
|
run: |
|
||||||
|
echo "Building RPM package for aarch64..."
|
||||||
|
npm run tauri build -- --target aarch64-unknown-linux-gnu --bundles rpm
|
||||||
|
cd src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/rpm/
|
||||||
|
for f in *.rpm; do
|
||||||
|
echo "AARCH64_RPM_PATH=src-tauri/target/aarch64-unknown-linux-gnu/release/bundle/rpm/$f" >> $GITHUB_ENV
|
||||||
|
done
|
||||||
|
|
||||||
- name: Get version from package.json
|
- name: Get version from package.json
|
||||||
id: version
|
id: version
|
||||||
@ -160,4 +169,15 @@ jobs:
|
|||||||
upload_url: ${{ github.event.inputs.release_upload_url }}
|
upload_url: ${{ github.event.inputs.release_upload_url }}
|
||||||
asset_path: ${{ env.AARCH64_DEB_PATH }}
|
asset_path: ${{ env.AARCH64_DEB_PATH }}
|
||||||
asset_name: NeoHtop_${{ steps.version.outputs.version }}_aarch64.deb
|
asset_name: NeoHtop_${{ steps.version.outputs.version }}_aarch64.deb
|
||||||
asset_content_type: application/vnd.debian.binary-package
|
asset_content_type: application/vnd.debian.binary-package
|
||||||
|
|
||||||
|
- name: Upload RPM Package to Release
|
||||||
|
if: github.event.inputs.release_upload_url != ''
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.inputs.release_upload_url }}
|
||||||
|
asset_path: ${{ env.AARCH64_RPM_PATH }}
|
||||||
|
asset_name: NeoHtop_${{ steps.version.outputs.version }}_aarch64.rpm
|
||||||
|
asset_content_type: application/x-rpm
|
22
.github/workflows/linux-x86_64-nightly.yml
vendored
22
.github/workflows/linux-x86_64-nightly.yml
vendored
@ -66,6 +66,15 @@ jobs:
|
|||||||
echo "DEB_PATH=src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/$f" >> $GITHUB_ENV
|
echo "DEB_PATH=src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/deb/$f" >> $GITHUB_ENV
|
||||||
done
|
done
|
||||||
|
|
||||||
|
- name: Build RPM Package (x86_64)
|
||||||
|
run: |
|
||||||
|
echo "Building RPM package for x86_64..."
|
||||||
|
npm run tauri build -- --target x86_64-unknown-linux-gnu --bundles rpm
|
||||||
|
cd src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/
|
||||||
|
for f in *.rpm; do
|
||||||
|
echo "RPM_PATH=src-tauri/target/x86_64-unknown-linux-gnu/release/bundle/rpm/$f" >> $GITHUB_ENV
|
||||||
|
done
|
||||||
|
|
||||||
- name: Get version from package.json
|
- name: Get version from package.json
|
||||||
id: version
|
id: version
|
||||||
run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
|
run: echo "version=$(node -p "require('./package.json').version")" >> $GITHUB_OUTPUT
|
||||||
@ -90,4 +99,15 @@ jobs:
|
|||||||
upload_url: ${{ github.event.inputs.release_upload_url }}
|
upload_url: ${{ github.event.inputs.release_upload_url }}
|
||||||
asset_path: ${{ env.DEB_PATH }}
|
asset_path: ${{ env.DEB_PATH }}
|
||||||
asset_name: NeoHtop_${{ steps.version.outputs.version }}_x86_64.deb
|
asset_name: NeoHtop_${{ steps.version.outputs.version }}_x86_64.deb
|
||||||
asset_content_type: application/vnd.debian.binary-package
|
asset_content_type: application/vnd.debian.binary-package
|
||||||
|
|
||||||
|
- name: Upload RPM Package to Release
|
||||||
|
if: github.event.inputs.release_upload_url != ''
|
||||||
|
uses: actions/upload-release-asset@v1
|
||||||
|
env:
|
||||||
|
GITHUB_TOKEN: ${{ secrets.PAT_TOKEN }}
|
||||||
|
with:
|
||||||
|
upload_url: ${{ github.event.inputs.release_upload_url }}
|
||||||
|
asset_path: ${{ env.RPM_PATH }}
|
||||||
|
asset_name: NeoHtop_${{ steps.version.outputs.version }}_x86_64.rpm
|
||||||
|
asset_content_type: application/x-rpm
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
Search for processes by name, command, or PID. Search for multiple things at once by separating them with commas. For
|
Search for processes by name, command, or PID. Search for multiple things at once by separating them with commas. For
|
||||||
example, `arm, x86` will return processes having `arm` or `x86` as a substring of the name or command. You can use
|
example, `arm, x86` will return processes having `arm` or `x86` as a substring of the name or command. You can use
|
||||||
regular expressions too. For example, `d$` will return a list of daemons (which tend to end in the letter `d`), while
|
regular expressions too. For example, `d$` will return a list of daemons (which tend to end in the letter `d`), while
|
||||||
`(\w+)\.\w+` will return a list of processes with reverse domain name notation, such as `com.docker.vmnetd`.
|
`^(\w+\.)+\w+$` will return a list of processes with reverse domain name notation, such as `com.docker.vmnetd`.
|
||||||
|
|
||||||
- 📌 Pin important processes
|
- 📌 Pin important processes
|
||||||
- 🛠 Process management (kill processes)
|
- 🛠 Process management (kill processes)
|
||||||
|
@ -39,8 +39,8 @@
|
|||||||
"resizable": true,
|
"resizable": true,
|
||||||
"title": "NeoHtop",
|
"title": "NeoHtop",
|
||||||
"width": 1280,
|
"width": 1280,
|
||||||
"minWidth": 1280,
|
"minWidth": 1120,
|
||||||
"minHeight": 900
|
"minHeight": 700
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"security": {
|
"security": {
|
||||||
|
@ -68,7 +68,13 @@
|
|||||||
const nameSubstringMatch = process.name
|
const nameSubstringMatch = process.name
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
.includes(term.toLowerCase());
|
.includes(term.toLowerCase());
|
||||||
const nameRegexMatch = new RegExp(term, "i").test(process.name);
|
const nameRegexMatch = (() => {
|
||||||
|
try {
|
||||||
|
return new RegExp(term, "i").test(process.name);
|
||||||
|
} catch {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
})();
|
||||||
const commandMatch = process.command
|
const commandMatch = process.command
|
||||||
.toLowerCase()
|
.toLowerCase()
|
||||||
.includes(term.toLowerCase());
|
.includes(term.toLowerCase());
|
||||||
|
Loading…
x
Reference in New Issue
Block a user