mirror of
https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party
synced 2025-12-26 20:50:30 +08:00
Compare commits
3 Commits
4b8ae4063d
...
b76757bc19
| Author | SHA1 | Date | |
|---|---|---|---|
|
b76757bc19 | ||
|
|
0753e5d138 | ||
|
|
583ece0a64 |
@ -305,7 +305,7 @@ const resolveGeosite = () =>
|
||||
const resolveGeoIP = () =>
|
||||
resolveResource({
|
||||
file: 'geoip.dat',
|
||||
downloadURL: `https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.dat`
|
||||
downloadURL: `https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat`
|
||||
})
|
||||
const resolveASN = () =>
|
||||
resolveResource({
|
||||
|
||||
@ -141,6 +141,7 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
|
||||
override: item.override || [],
|
||||
useProxy: item.useProxy || false,
|
||||
allowFixedInterval: item.allowFixedInterval || false,
|
||||
autoUpdate: item.autoUpdate ?? false,
|
||||
updated: new Date().getTime()
|
||||
} as IProfileItem
|
||||
switch (newItem.type) {
|
||||
|
||||
@ -8,7 +8,7 @@ export async function initProfileUpdater(): Promise<void> {
|
||||
const currentItem = await getCurrentProfileItem()
|
||||
|
||||
for (const item of items.filter((i) => i.id !== current)) {
|
||||
if (item.type === 'remote' && item.interval) {
|
||||
if (item.type === 'remote' && item.autoUpdate && item.interval) {
|
||||
if (typeof item.interval === 'number') {
|
||||
// 数字间隔使用setInterval
|
||||
intervalPool[item.id] = setInterval(
|
||||
@ -40,7 +40,7 @@ export async function initProfileUpdater(): Promise<void> {
|
||||
}
|
||||
}
|
||||
|
||||
if (currentItem?.type === 'remote' && currentItem.interval) {
|
||||
if (currentItem?.type === 'remote' && currentItem.autoUpdate && currentItem.interval) {
|
||||
if (typeof currentItem.interval === 'number') {
|
||||
intervalPool[currentItem.id] = setInterval(
|
||||
async () => {
|
||||
@ -82,7 +82,7 @@ export async function initProfileUpdater(): Promise<void> {
|
||||
}
|
||||
|
||||
export async function addProfileUpdater(item: IProfileItem): Promise<void> {
|
||||
if (item.type === 'remote' && item.interval) {
|
||||
if (item.type === 'remote' && item.autoUpdate && item.interval) {
|
||||
if (intervalPool[item.id]) {
|
||||
if (intervalPool[item.id] instanceof Cron) {
|
||||
(intervalPool[item.id] as Cron).stop()
|
||||
|
||||
@ -79,6 +79,10 @@
|
||||
user-select: none;
|
||||
}
|
||||
|
||||
.select-text {
|
||||
user-select: text !important;
|
||||
}
|
||||
|
||||
*:focus {
|
||||
outline: none;
|
||||
outline-color: transparent;
|
||||
|
||||
@ -100,68 +100,81 @@ const EditInfoModal: React.FC<Props> = (props) => {
|
||||
}}
|
||||
/>
|
||||
</SettingItem>
|
||||
<SettingItem title={t('profiles.editInfo.interval')}>
|
||||
<div className="flex flex-col gap-2">
|
||||
<Input
|
||||
size="sm"
|
||||
type="text"
|
||||
className={cn(
|
||||
inputWidth,
|
||||
// 不合法
|
||||
typeof values.interval === 'string' &&
|
||||
!/^\d+$/.test(values.interval) &&
|
||||
!isValidCron(values.interval, { seconds: false }) &&
|
||||
'border-red-500'
|
||||
)}
|
||||
value={values.interval?.toString() ?? ''}
|
||||
onValueChange={(v) => {
|
||||
// 输入限制
|
||||
if (/^[\d\s*\-,\/]*$/.test(v)) {
|
||||
// 纯数字
|
||||
if (/^\d+$/.test(v)) {
|
||||
setValues({ ...values, interval: parseInt(v, 10) || 0 });
|
||||
return;
|
||||
}
|
||||
// 非纯数字
|
||||
try {
|
||||
setValues({ ...values, interval: v });
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}}
|
||||
placeholder={t('profiles.editInfo.intervalPlaceholder')}
|
||||
/>
|
||||
|
||||
{/* 动态提示信息 */}
|
||||
<div className="text-xs" style={{
|
||||
color: typeof values.interval === 'string' &&
|
||||
!/^\d+$/.test(values.interval) &&
|
||||
!isValidCron(values.interval, { seconds: false })
|
||||
? '#ef4444'
|
||||
: '#6b7280'
|
||||
}}>
|
||||
{typeof values.interval === 'number' ? (
|
||||
t('profiles.editInfo.intervalMinutes')
|
||||
) : /^\d+$/.test(values.interval?.toString() || '') ? (
|
||||
t('profiles.editInfo.intervalMinutes')
|
||||
) : isValidCron(values.interval?.toString() || '', { seconds: false }) ? (
|
||||
t('profiles.editInfo.intervalCron')
|
||||
) : (
|
||||
t('profiles.editInfo.intervalHint')
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</SettingItem>
|
||||
<SettingItem title={t('profiles.editInfo.fixedInterval')}>
|
||||
<SettingItem title={t('profiles.editInfo.autoUpdate')}>
|
||||
<Switch
|
||||
size="sm"
|
||||
isSelected={values.allowFixedInterval ?? false}
|
||||
isSelected={values.autoUpdate ?? false}
|
||||
onValueChange={(v) => {
|
||||
setValues({ ...values, allowFixedInterval: v })
|
||||
setValues({ ...values, autoUpdate: v })
|
||||
}}
|
||||
/>
|
||||
</SettingItem>
|
||||
{values.autoUpdate && (
|
||||
<>
|
||||
<SettingItem title={t('profiles.editInfo.interval')}>
|
||||
<div className="flex flex-col gap-2">
|
||||
<Input
|
||||
size="sm"
|
||||
type="text"
|
||||
className={cn(
|
||||
inputWidth,
|
||||
// 不合法
|
||||
typeof values.interval === 'string' &&
|
||||
!/^\d+$/.test(values.interval) &&
|
||||
!isValidCron(values.interval, { seconds: false }) &&
|
||||
'border-red-500'
|
||||
)}
|
||||
value={values.interval?.toString() ?? ''}
|
||||
onValueChange={(v) => {
|
||||
// 输入限制
|
||||
if (/^[\d\s*\-,\/]*$/.test(v)) {
|
||||
// 纯数字
|
||||
if (/^\d+$/.test(v)) {
|
||||
setValues({ ...values, interval: parseInt(v, 10) || 0 });
|
||||
return;
|
||||
}
|
||||
// 非纯数字
|
||||
try {
|
||||
setValues({ ...values, interval: v });
|
||||
} catch (e) {
|
||||
// ignore
|
||||
}
|
||||
}
|
||||
}}
|
||||
placeholder={t('profiles.editInfo.intervalPlaceholder')}
|
||||
/>
|
||||
|
||||
{/* 动态提示信息 */}
|
||||
<div className="text-xs" style={{
|
||||
color: typeof values.interval === 'string' &&
|
||||
!/^\d+$/.test(values.interval) &&
|
||||
!isValidCron(values.interval, { seconds: false })
|
||||
? '#ef4444'
|
||||
: '#6b7280'
|
||||
}}>
|
||||
{typeof values.interval === 'number' ? (
|
||||
t('profiles.editInfo.intervalMinutes')
|
||||
) : /^\d+$/.test(values.interval?.toString() || '') ? (
|
||||
t('profiles.editInfo.intervalMinutes')
|
||||
) : isValidCron(values.interval?.toString() || '', { seconds: false }) ? (
|
||||
t('profiles.editInfo.intervalCron')
|
||||
) : (
|
||||
t('profiles.editInfo.intervalHint')
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
</SettingItem>
|
||||
<SettingItem title={t('profiles.editInfo.fixedInterval')}>
|
||||
<Switch
|
||||
size="sm"
|
||||
isSelected={values.allowFixedInterval ?? false}
|
||||
onValueChange={(v) => {
|
||||
setValues({ ...values, allowFixedInterval: v })
|
||||
}}
|
||||
/>
|
||||
</SettingItem>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
<SettingItem title={t('profiles.editInfo.override.title')}>
|
||||
|
||||
@ -446,6 +446,7 @@
|
||||
"profiles.editInfo.intervalCron": "Valid Cron expression",
|
||||
"profiles.editInfo.intervalHint": "Please enter a number or a valid Cron expression (e.g.: 0 * * * *)",
|
||||
"profiles.editInfo.fixedInterval": "Fixed Update Interval",
|
||||
"profiles.editInfo.autoUpdate": "Auto Update",
|
||||
"profiles.editInfo.override.title": "Override",
|
||||
"profiles.editInfo.override.global": "Global",
|
||||
"profiles.editInfo.override.noAvailable": "No available overrides",
|
||||
|
||||
@ -451,6 +451,7 @@
|
||||
"profiles.editInfo.intervalCron": "有效的Cron表达式",
|
||||
"profiles.editInfo.intervalHint": "请输入数字或合法的Cron表达式（如：0 * * * *）",
|
||||
"profiles.editInfo.fixedInterval": "固定更新间隔",
|
||||
"profiles.editInfo.autoUpdate": "自动更新",
|
||||
"profiles.editInfo.override.title": "覆写",
|
||||
"profiles.editInfo.override.global": "全局",
|
||||
"profiles.editInfo.override.noAvailable": "没有可用的覆写",
|
||||
|
||||
1
src/shared/types.d.ts
vendored
1
src/shared/types.d.ts
vendored
@ -491,6 +491,7 @@ interface IProfileItem {
|
||||
extra?: ISubscriptionUserInfo
|
||||
substore?: boolean
|
||||
allowFixedInterval?: boolean
|
||||
autoUpdate?: boolean
|
||||
}
|
||||
|
||||
interface ISubStoreSub {
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user