Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: move a32nx and FSLTL injector to fragmenter releases #44

Merged
merged 3 commits into from
Oct 26, 2024
Merged

chore: move a32nx and FSLTL injector to fragmenter releases #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f3be51
fix: update typedefs
Benjozork Oct 26, 2024
4c20518
chore: move a32nx tracks to fragmenter release
Benjozork Oct 26, 2024
f64a214
chore: move FSLTL injector tracks to fragmenter release
Benjozork Oct 26, 2024
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
15 changes: 7 additions & 8 deletions config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ const config: Configuration = {
'with each major patch from MSFS.',
isExperimental: false,
releaseModel: {
type: 'githubRelease',
type: 'fragmenter',
},
},
{
Expand All @@ -121,8 +121,7 @@ const config: Configuration = {
'branch on Github. Please visit our discord for support.',
isExperimental: false,
releaseModel: {
type: 'githubBranch',
branch: 'master',
type: 'fragmenter',
},
},
],
Expand Down Expand Up @@ -307,7 +306,7 @@ const config: Configuration = {
backgroundImageUrls: ['https://flybywirecdn.com/installer/media-assets/addon-headers/fbw-simbridge/0.png'],
backgroundImageShadow: false,
shortDescription: 'Airbus A380-800',
description: `<span style="color: rgb(255, 106, 0);">&#9888; Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\<Username>\\Documents\\FlyByWireSim\\Simbridge\\resources)\`. <br> Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder.</span> \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`,
description: `<span style="color: rgb(255, 106, 0);">&#9888; Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\<Username>\\Documents\\FlyByWireSim\\Simbridge\\resources)\`. <br> Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder.</span> \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`,
targetDirectory: 'flybywire-externaltools-simbridge',
tracks: [
{
Expand All @@ -322,7 +321,7 @@ const config: Configuration = {
'https://cdn.flybywiresim.com/addons/simbridge/release/',
],
isExperimental: false,
description: `<span style="color: rgb(255, 106, 0);">&#9888; Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\<Username>\\Documents\\FlyByWireSim\\Simbridge\\resources)\`. <br> Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder.</span> \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`,
description: `<span style="color: rgb(255, 106, 0);">&#9888; Important: Starting with version 0.6.0, custom resources such as PDF Charts and Company Routes must be stored in the Documents folder (typically located at \`C:\\Users\\<Username>\\Documents\\FlyByWireSim\\Simbridge\\resources)\`. <br> Please ensure you back up your files before updating. After the update, transfer your files to this new location to keep them safe from future updates. You can also use the Resources button in the About section of the installer to locate the folder.</span> \n\nSimBridge is an external app that enables FlyByWire Simulations aircraft to communicate outside your simulator. From remote displays to external terrain display rendering, it is used for a variety of optional features.`,
},
],
disallowedRunningExternalApps: ['@/simbridge-app'],
Expand Down Expand Up @@ -529,19 +528,19 @@ const config: Configuration = {
url: 'https://github.com/FSLiveTrafficLiveries/FSLTL_Injector_Releases/releases/latest/download/',
isExperimental: false,
releaseModel: {
type: 'CDN',
type: 'fragmenter',
},
description: 'Stable version of the FSLTL Traffic Injector for use on stable versions of MSFS.\n\n'+
'Follow the user guide at https://www.fslivetrafficliveries.com/user-guide/ before use.',
},
{
{
name: 'Experimental',
key: 'development',
url: 'https://github.com/FSLiveTrafficLiveries/FSLTL_Injector_Releases/releases/download/beta/',
isExperimental: true,
warningContent: 'No support is offered for this release, it is a preview of features that may be included in future releases.',
releaseModel: {
type: 'CDN',
type: 'fragmenter',
},
description: 'Experimental Release that includes features that are not yet ready for stable release.\n\n'+
'You can provide feedback on these new features in the FSLTL Discord.\n\n'+
Expand Down
36 changes: 25 additions & 11 deletions lib.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,26 +14,27 @@ export interface NamedDirectoryDefinition extends DirectoryDefinition {
title: string,
}

export type AddonVersion = {
title: string,
date: Date,
type: 'major' | 'minor' | 'patch'
export type FragmenterReleaseModel = {
type: 'fragmenter',
}

export type GithubReleaseReleaseModel = {
/** @deprecated */
type: 'githubRelease',
}

export type GithubBranchReleaseModel = {
/** @deprecated */
type: 'githubBranch',
branch: string,
}

export type CDNReleaseModel = {
/** @deprecated */
type: 'CDN',
}

export type ReleaseModel = GithubReleaseReleaseModel | GithubBranchReleaseModel | CDNReleaseModel
export type ReleaseModel = FragmenterReleaseModel | GithubReleaseReleaseModel | GithubBranchReleaseModel | CDNReleaseModel

type BaseAddonTrack = {
name: string,
Expand Down Expand Up @@ -151,28 +152,41 @@ export interface AddonDependency {
}

/**
* fields from the addon's manifest.json
* Fields from the addon's manifest.json
*/
export interface AddonIncompatibleAddon {
/**
* Fields from the addon's manifest.json
* Field from the addon's manifest.json
* This need to be configured identically to the addon's manifest.json
* Leaving a field empty ignores it for the search.
*/
title?: string,

/**
* Field from the addon's manifest.json
* This need to be configured identically to the addon's manifest.json
* Leaving a field empty ignores it for the search.
*/
creator?: string,

/**
* packageVersion syntax follows: https://www.npmjs.com/package/semver
* Field from the addon's manifest.json
* This need to be configured identically to the addon's manifest.json
* Leaving a field empty ignores it for the search.
*
* This supports semver notation.
*/
packageVersion?: string,

/**
* folder name in community - added later to show the user the corresponding folder name - not used for searching
*/
folder?: string,

/**
* Description of the nature of the incompatibility to display to the user in a warning dialog
*/
description?: string
description?: string,
}

export interface AddonTechSpec {
Expand Down Expand Up @@ -202,7 +216,7 @@ export interface ConfigurationAspect {
/**
* The title of the page containing the choices
*/
title: string
title: string,

/**
* What to apply the list of desired choices to
Expand Down Expand Up @@ -255,7 +269,7 @@ export type AddonCategoryDefinition = DefinitionBase & {
kind: 'addonCategory',
key: string,
title?: string,
styles?: ('align-bottom')[],
styles?: 'align-bottom'[],
}

export type ExternalApplicationDefinition = DefinitionBase & {
Expand Down
Loading