Skip to content

feat: link opening name to lichess page instead of wikibooks in explorer #989

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

Merged
merged 1 commit into from
Sep 9, 2024
Merged

feat: link opening name to lichess page instead of wikibooks in explorer #989

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 0 additions & 19 deletions lib/src/model/analysis/analysis_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,6 @@ class AnalysisController extends _$AnalysisController {
lastMove: lastMove,
pov: options.orientation,
contextOpening: options.opening,
wikiBooksUrl: _wikiBooksUrl(currentPath),
isLocalEvaluationAllowed: options.isLocalEvaluationAllowed,
isLocalEvaluationEnabled: prefs.enableLocalEvaluation,
displayMode: DisplayMode.moves,
Expand Down Expand Up @@ -433,7 +432,6 @@ class AnalysisController extends _$AnalysisController {
isOnMainline: _root.isOnMainline(path),
currentNode: AnalysisCurrentNode.fromNode(currentNode),
currentBranchOpening: opening,
wikiBooksUrl: _wikiBooksUrl(path),
lastMove: currentNode.sanMove.move,
promotionMove: null,
root: rootView,
Expand All @@ -444,7 +442,6 @@ class AnalysisController extends _$AnalysisController {
isOnMainline: _root.isOnMainline(path),
currentNode: AnalysisCurrentNode.fromNode(currentNode),
currentBranchOpening: opening,
wikiBooksUrl: _wikiBooksUrl(path),
lastMove: null,
promotionMove: null,
root: rootView,
Expand Down Expand Up @@ -477,19 +474,6 @@ class AnalysisController extends _$AnalysisController {
}
}

String? _wikiBooksUrl(UciPath path) {
if (_root.position.ply > 30) {
return null;
}
final nodes = _root.branchesOn(path);
final moves = nodes.map((node) {
final move = node.view.sanMove.san;
final moveNr = (node.position.ply / 2).ceil();
return node.position.ply.isOdd ? '$moveNr._$move' : '$moveNr...$move';
});
return 'https://en.wikibooks.org/wiki/Chess_Opening_Theory/${moves.join("/")}';
}

void _startEngineEval() {
if (!state.isEngineAvailable) return;
ref
Expand Down Expand Up @@ -680,9 +664,6 @@ class AnalysisState with _$AnalysisState {
/// The opening of the current branch.
Opening? currentBranchOpening,

/// wikibooks.org opening theory page for the current path
String? wikiBooksUrl,

/// Optional server analysis to display player stats.
({PlayerAnalysis white, PlayerAnalysis black})? playersAnalysis,

Expand Down
10 changes: 0 additions & 10 deletions lib/src/model/opening_explorer/opening_explorer_repository.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,13 +143,3 @@ class OpeningExplorerRepository {
);
}
}

@riverpod
Future<bool> wikiBooksPageExists(
WikiBooksPageExistsRef ref, {
required String url,
}) async {
final client = ref.read(defaultClientProvider);
final response = await client.get(Uri.parse(url));
return response.statusCode == 200;
}
40 changes: 12 additions & 28 deletions lib/src/view/opening_explorer/opening_explorer_screen.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ class _OpeningExplorerState extends ConsumerState<_OpeningExplorer> {
pgn: widget.pgn,
options: widget.options,
opening: opening,
wikiBooksUrl: analysisState.wikiBooksUrl,
explorerContent: lastExplorerWidgets ??
[
Shimmer(
Expand All @@ -270,7 +269,6 @@ class _OpeningExplorerState extends ConsumerState<_OpeningExplorer> {
options: widget.options,
opening: opening,
openingExplorer: openingExplorer,
wikiBooksUrl: analysisState.wikiBooksUrl,
explorerContent: [
Center(
child: Padding(
Expand Down Expand Up @@ -345,15 +343,13 @@ class _OpeningExplorerState extends ConsumerState<_OpeningExplorer> {
options: widget.options,
opening: opening,
openingExplorer: openingExplorer,
wikiBooksUrl: analysisState.wikiBooksUrl,
explorerContent: explorerContent,
);
},
loading: () => _OpeningExplorerView.loading(
pgn: widget.pgn,
options: widget.options,
opening: opening,
wikiBooksUrl: analysisState.wikiBooksUrl,
explorerContent: lastExplorerWidgets ??
[
Shimmer(
Expand Down Expand Up @@ -386,15 +382,13 @@ class _OpeningExplorerView extends StatelessWidget {
required this.options,
required this.opening,
required this.openingExplorer,
required this.wikiBooksUrl,
required this.explorerContent,
}) : loading = false;

const _OpeningExplorerView.loading({
required this.pgn,
required this.options,
required this.opening,
required this.wikiBooksUrl,
required this.explorerContent,
}) : loading = true,
openingExplorer = null;
Expand All @@ -403,7 +397,6 @@ class _OpeningExplorerView extends StatelessWidget {
final AnalysisOptions options;
final Opening? opening;
final ({OpeningExplorerEntry entry, bool isIndexing})? openingExplorer;
final String? wikiBooksUrl;
final List<Widget> explorerContent;
final bool loading;

Expand Down Expand Up @@ -435,7 +428,6 @@ class _OpeningExplorerView extends StatelessWidget {
flex: 75,
child: _Opening(
opening: opening!,
wikiBooksUrl: wikiBooksUrl,
),
),
if (openingExplorer?.isIndexing == true)
Expand Down Expand Up @@ -472,33 +464,25 @@ class _OpeningExplorerView extends StatelessWidget {
class _Opening extends ConsumerWidget {
const _Opening({
required this.opening,
required this.wikiBooksUrl,
});

final Opening opening;
final String? wikiBooksUrl;
@override
Widget build(BuildContext context, WidgetRef ref) {
final openingWidget = Text(
'${opening.eco.isEmpty ? "" : "${opening.eco} "}${opening.name}',
style: TextStyle(
color: Theme.of(context).colorScheme.onSecondaryContainer,
fontWeight: FontWeight.bold,
return GestureDetector(
onTap: opening.name == context.l10n.startPosition
? null
: () => launchUrl(
Uri.parse('https://lichess.org/opening/${opening.name}'),
),
child: Text(
'${opening.eco.isEmpty ? "" : "${opening.eco} "}${opening.name}',
style: TextStyle(
color: Theme.of(context).colorScheme.onSecondaryContainer,
fontWeight: FontWeight.bold,
),
),
);

return wikiBooksUrl == null
? openingWidget
: ref.watch(wikiBooksPageExistsProvider(url: wikiBooksUrl!)).when(
data: (wikiBooksPageExists) => wikiBooksPageExists
? GestureDetector(
onTap: () => launchUrl(Uri.parse(wikiBooksUrl!)),
child: openingWidget,
)
: openingWidget,
loading: () => openingWidget,
error: (e, s) => openingWidget,
);
}
}

Expand Down
3 changes: 0 additions & 3 deletions test/view/opening_explorer/opening_explorer_screen_test.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,6 @@ void main() {
return mockResponse(playerOpeningExplorerResponse, 200);
}
}
if (request.url.host == 'en.wikibooks.org') {
return mockResponse('', 200);
}
return mockResponse('', 404);
});

Expand Down