mirror of
https://gh.catmak.name/https://github.com/mihomo-party-org/mihomo-party
synced 2025-12-27 05:00:30 +08:00
Compare commits
No commits in common. "b76757bc192f3221bdd93640965193895569adaa" and "4b8ae4063d50e8de7481b6ad721e874f09358966" have entirely different histories.
b76757bc19
...
4b8ae4063d
@ -305,7 +305,7 @@ const resolveGeosite = () =>
|
|||||||
const resolveGeoIP = () =>
|
const resolveGeoIP = () =>
|
||||||
resolveResource({
|
resolveResource({
|
||||||
file: 'geoip.dat',
|
file: 'geoip.dat',
|
||||||
downloadURL: `https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip.dat`
|
downloadURL: `https://github.com/MetaCubeX/meta-rules-dat/releases/download/latest/geoip-lite.dat`
|
||||||
})
|
})
|
||||||
const resolveASN = () =>
|
const resolveASN = () =>
|
||||||
resolveResource({
|
resolveResource({
|
||||||
|
|||||||
@ -141,7 +141,6 @@ export async function createProfile(item: Partial<IProfileItem>): Promise<IProfi
|
|||||||
override: item.override || [],
|
override: item.override || [],
|
||||||
useProxy: item.useProxy || false,
|
useProxy: item.useProxy || false,
|
||||||
allowFixedInterval: item.allowFixedInterval || false,
|
allowFixedInterval: item.allowFixedInterval || false,
|
||||||
autoUpdate: item.autoUpdate ?? false,
|
|
||||||
updated: new Date().getTime()
|
updated: new Date().getTime()
|
||||||
} as IProfileItem
|
} as IProfileItem
|
||||||
switch (newItem.type) {
|
switch (newItem.type) {
|
||||||
|
|||||||
@ -8,7 +8,7 @@ export async function initProfileUpdater(): Promise<void> {
|
|||||||
const currentItem = await getCurrentProfileItem()
|
const currentItem = await getCurrentProfileItem()
|
||||||
|
|
||||||
for (const item of items.filter((i) => i.id !== current)) {
|
for (const item of items.filter((i) => i.id !== current)) {
|
||||||
if (item.type === 'remote' && item.autoUpdate && item.interval) {
|
if (item.type === 'remote' && item.interval) {
|
||||||
if (typeof item.interval === 'number') {
|
if (typeof item.interval === 'number') {
|
||||||
// 数字间隔使用setInterval
|
// 数字间隔使用setInterval
|
||||||
intervalPool[item.id] = setInterval(
|
intervalPool[item.id] = setInterval(
|
||||||
@ -40,7 +40,7 @@ export async function initProfileUpdater(): Promise<void> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (currentItem?.type === 'remote' && currentItem.autoUpdate && currentItem.interval) {
|
if (currentItem?.type === 'remote' && currentItem.interval) {
|
||||||
if (typeof currentItem.interval === 'number') {
|
if (typeof currentItem.interval === 'number') {
|
||||||
intervalPool[currentItem.id] = setInterval(
|
intervalPool[currentItem.id] = setInterval(
|
||||||
async () => {
|
async () => {
|
||||||
@ -82,7 +82,7 @@ export async function initProfileUpdater(): Promise<void> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export async function addProfileUpdater(item: IProfileItem): Promise<void> {
|
export async function addProfileUpdater(item: IProfileItem): Promise<void> {
|
||||||
if (item.type === 'remote' && item.autoUpdate && item.interval) {
|
if (item.type === 'remote' && item.interval) {
|
||||||
if (intervalPool[item.id]) {
|
if (intervalPool[item.id]) {
|
||||||
if (intervalPool[item.id] instanceof Cron) {
|
if (intervalPool[item.id] instanceof Cron) {
|
||||||
(intervalPool[item.id] as Cron).stop()
|
(intervalPool[item.id] as Cron).stop()
|
||||||
|
|||||||
@ -79,10 +79,6 @@
|
|||||||
user-select: none;
|
user-select: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
.select-text {
|
|
||||||
user-select: text !important;
|
|
||||||
}
|
|
||||||
|
|
||||||
*:focus {
|
*:focus {
|
||||||
outline: none;
|
outline: none;
|
||||||
outline-color: transparent;
|
outline-color: transparent;
|
||||||
|
|||||||
@ -100,17 +100,6 @@ const EditInfoModal: React.FC<Props> = (props) => {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</SettingItem>
|
</SettingItem>
|
||||||
<SettingItem title={t('profiles.editInfo.autoUpdate')}>
|
|
||||||
<Switch
|
|
||||||
size="sm"
|
|
||||||
isSelected={values.autoUpdate ?? false}
|
|
||||||
onValueChange={(v) => {
|
|
||||||
setValues({ ...values, autoUpdate: v })
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
</SettingItem>
|
|
||||||
{values.autoUpdate && (
|
|
||||||
<>
|
|
||||||
<SettingItem title={t('profiles.editInfo.interval')}>
|
<SettingItem title={t('profiles.editInfo.interval')}>
|
||||||
<div className="flex flex-col gap-2">
|
<div className="flex flex-col gap-2">
|
||||||
<Input
|
<Input
|
||||||
@ -175,8 +164,6 @@ const EditInfoModal: React.FC<Props> = (props) => {
|
|||||||
</SettingItem>
|
</SettingItem>
|
||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
</>
|
|
||||||
)}
|
|
||||||
<SettingItem title={t('profiles.editInfo.override.title')}>
|
<SettingItem title={t('profiles.editInfo.override.title')}>
|
||||||
<div>
|
<div>
|
||||||
{overrideItems
|
{overrideItems
|
||||||
|
|||||||
@ -446,7 +446,6 @@
|
|||||||
"profiles.editInfo.intervalCron": "Valid Cron expression",
|
"profiles.editInfo.intervalCron": "Valid Cron expression",
|
||||||
"profiles.editInfo.intervalHint": "Please enter a number or a valid Cron expression (e.g.: 0 * * * *)",
|
"profiles.editInfo.intervalHint": "Please enter a number or a valid Cron expression (e.g.: 0 * * * *)",
|
||||||
"profiles.editInfo.fixedInterval": "Fixed Update Interval",
|
"profiles.editInfo.fixedInterval": "Fixed Update Interval",
|
||||||
"profiles.editInfo.autoUpdate": "Auto Update",
|
|
||||||
"profiles.editInfo.override.title": "Override",
|
"profiles.editInfo.override.title": "Override",
|
||||||
"profiles.editInfo.override.global": "Global",
|
"profiles.editInfo.override.global": "Global",
|
||||||
"profiles.editInfo.override.noAvailable": "No available overrides",
|
"profiles.editInfo.override.noAvailable": "No available overrides",
|
||||||
|
|||||||
@ -451,7 +451,6 @@
|
|||||||
"profiles.editInfo.intervalCron": "有效的Cron表达式",
|
"profiles.editInfo.intervalCron": "有效的Cron表达式",
|
||||||
"profiles.editInfo.intervalHint": "请输入数字或合法的Cron表达式(如:0 * * * *)",
|
"profiles.editInfo.intervalHint": "请输入数字或合法的Cron表达式(如:0 * * * *)",
|
||||||
"profiles.editInfo.fixedInterval": "固定更新间隔",
|
"profiles.editInfo.fixedInterval": "固定更新间隔",
|
||||||
"profiles.editInfo.autoUpdate": "自动更新",
|
|
||||||
"profiles.editInfo.override.title": "覆写",
|
"profiles.editInfo.override.title": "覆写",
|
||||||
"profiles.editInfo.override.global": "全局",
|
"profiles.editInfo.override.global": "全局",
|
||||||
"profiles.editInfo.override.noAvailable": "没有可用的覆写",
|
"profiles.editInfo.override.noAvailable": "没有可用的覆写",
|
||||||
|
|||||||
1
src/shared/types.d.ts
vendored
1
src/shared/types.d.ts
vendored
@ -491,7 +491,6 @@ interface IProfileItem {
|
|||||||
extra?: ISubscriptionUserInfo
|
extra?: ISubscriptionUserInfo
|
||||||
substore?: boolean
|
substore?: boolean
|
||||||
allowFixedInterval?: boolean
|
allowFixedInterval?: boolean
|
||||||
autoUpdate?: boolean
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ISubStoreSub {
|
interface ISubStoreSub {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user