leamas commented 3 years ago

Taking twocan as an example here seems to be two copies, one of which outdated and buggy:

1

021-08-20T17:31:41.6115591Z Processing  file:///home/runner/work/plugins/plugins/docs/twocan/0.1/index.html
2021-08-20T17:31:41.6116101Z 
2021-08-20T17:31:41.6116638Z This may take some time if the document has many links to check.
2021-08-20T17:31:41.6118030Z processing https://opencpn-manuals.github.io/plugins in base file:///home/runner/work/plugins/plugins/docs
2021-08-20T17:31:41.6119832Z processing https://opencpn-manuals.github.io/plugins/ in base file:///home/runner/work/plugins/plugins/docs
2021-08-20T17:31:41.6121750Z processing https://opencpn-manuals.github.io/plugins/twocan/0.1/index.html in base file:///home/runner/work/plugins/plugins/docs
2021-08-20T17:31:41.6122684Z 
2021-08-20T17:31:41.6122895Z 
2021-08-20T17:31:41.6123252Z Valid links.
2021-08-20T17:31:41.6123626Z Anchors
2021-08-20T17:31:41.6123875Z 
2021-08-20T17:31:41.6124241Z Found 8 anchors.

2

021-08-20T17:32:25.0369331Z Processing  file:///home/runner/work/plugins/plugins/docs/opencpn-plugins/0.1/twocan/twocan.html
2021-08-20T17:32:25.0370459Z 
2021-08-20T17:32:25.0371407Z This may take some time if the document has many links to check.
2021-08-20T17:32:25.0373850Z processing https://opencpn-manuals.github.io/plugins in base file:///home/runner/work/plugins/plugins/docs
2021-08-20T17:32:25.0377314Z processing https://opencpn-manuals.github.io/plugins/ in base file:///home/runner/work/plugins/plugins/docs
2021-08-20T17:32:25.0380933Z processing https://opencpn-manuals.github.io/plugins/opencpn-plugins/0.1/twocan/twocan.html in base file:///home/runner/work/plugins/plugins/docs
2021-08-20T17:32:25.0382756Z 
2021-08-20T17:32:25.0383211Z 
2021-08-20T17:32:25.0383830Z Valid links.
2021-08-20T17:32:25.0384295Z 
2021-08-20T17:32:25.0384936Z List of redirects
2021-08-20T17:32:25.0385443Z 
2021-08-20T17:32:25.0386277Z http://www.axiomtek.com/Default.aspx?MenuId=Products&FunctionId=ProductView&ItemId=8270&upcat=318&C=AX92903
2021-08-20T17:32:25.0387925Z -> https://www.axiomtek.com/Default.aspx?MenuId=Products&FunctionId=ProductView&ItemId=8270&upcat=318&C=AX92903    
2021-08-20T17:32:25.0388984Z   Line: 516
2021-08-20T17:32:25.0389503Z   Code: 301 -> 200 OK
2021-08-20T17:32:25.0390110Z  To do: This is a permanent redirect. The link should be updated.
2021-08-20T17:32:25.0390558Z 
2021-08-20T17:32:25.0391259Z https://github.com/twocanplugin/twocanplugindrivers.git
2021-08-20T17:32:25.0392471Z -> https://github.com/twocanplugin/twocanplugindrivers 
2021-08-20T17:32:25.0393155Z  Lines: 621, 625
2021-08-20T17:32:25.0393684Z   Code: 301 -> 200 OK
2021-08-20T17:32:25.0394274Z  To do: This is a permanent redirect. The link should be updated.
2021-08-20T17:32:25.0394742Z 
2021-08-20T17:32:25.0395163Z http://canable.io/
2021-08-20T17:32:25.0395859Z -> https://canable.io/ 
2021-08-20T17:32:25.0396336Z   Line: 513
2021-08-20T17:32:25.0396832Z   Code: 301 -> 200 OK
2021-08-20T17:32:25.0397437Z  To do: This is a permanent redirect. The link should be updated.
2021-08-20T17:32:25.0398007Z Anchors
2021-08-20T17:32:25.0398257Z 
2021-08-20T17:32:25.0398612Z Found 8 anchors.

leamas commented 3 years ago

@rasbats: The duplicate files exists as separate copies in manual/master_plugins and manual/beta-plugins. I have removed those which are part of plugins I have worked with, but left the others.

Note that when removing it's not only about the .adoc file but rather the complete component



manual/beta-plugins/modules/ROOT/nav.adoc
manual/beta-plugins/modules/ROOT/pages/beta-plugins.adoc
manual/beta-plugins/modules/ROOT/pages/index.adoc
manual/beta-plugins/modules/admiralty/pages/admiralty.adoc
manual/beta-plugins/modules/autopilot-rm/pages/autopilot-rm.adoc
manual/beta-plugins/modules/autopilot_route/pages/autopilot_route.adoc
manual/beta-plugins/modules/engine-dash/pages/engine-dash.adoc
manual/beta-plugins/modules/javascript/pages/javascript.adoc
manual/beta-plugins/modules/ncdf/pages/ncdf.adoc
manual/beta-plugins/modules/otidalroute/pages/otidalroute.adoc
manual/beta-plugins/modules/sailawaynmea/pages/sailawaynmea.adoc
manual/beta-plugins/modules/survey/pages/survey.adoc
manual/beta-plugins/modules/tidefinder/pages/tidefinder.adoc
manual/beta-plugins/modules/trackpoint/pages/trackpoint.adoc
manual/beta-plugins/modules/uktides/pages/uktides.adoc
manual/master-plugins/modules/ROOT/nav.adoc
manual/master-plugins/modules/ROOT/pages/index.adoc
manual/master-plugins/modules/ROOT/pages/plugins.adoc
manual/master-plugins/modules/ROOT/partials/nav-betaplugins.adoc
manual/master-plugins/modules/ROOT/partials/nav-plugins.adoc
manual/master-plugins/modules/authoring/pages/FAQ.adoc
manual/master-plugins/modules/authoring/pages/TODO.adoc
manual/master-plugins/modules/authoring/pages/author.adoc
manual/master-plugins/modules/authoring/pages/intro.adoc
manual/master-plugins/modules/authoring/pages/localbuild.adoc
manual/master-plugins/modules/authoring/pages/pm-plugin-documentation.adoc
manual/master-plugins/modules/authoring/pages/tools.adoc
manual/master-plugins/modules/authoring/pages/useful.adoc
manual/master-plugins/modules/chart_downloader_tab/pages/chart_downloader_tab.adoc
manual/master-plugins/modules/dashboard/pages/dashboard.adoc
manual/master-plugins/modules/ge2kap/pages/ge2kap.adoc
manual/master-plugins/modules/grib_weather/pages/grib_weather.adoc
manual/master-plugins/modules/grib_weather/pages/mail_servers.adoc
manual/master-plugins/modules/oernc/pages/oernc.adoc
manual/master-plugins/modules/squiddio/pages/squiddio.adoc
manual/master-plugins/modules/wmm/pages/wmm.adoc

leamas commented 3 years ago

I removed everything besides

ROOT
authoring
The bundled plugins chartdl_dr, wmm, grib and dashboard

Instructions how to retrieve files from the git history (nothing is ever lost!) in https://github.com/opencpn-manuals/main/discussions/14, should it be required.

Had to fix interesting errors in the navigation links since some of them pointed to the duplicated stuff.

Rasbats commented 3 years ago

@leamas : Have you got an example of a file link that works. Problems with vdr still.

index.adoc Works in Firefox but not from the website. The file is rausch...zip

Rasbats commented 3 years ago

Ok ... found {attachmentsdir} in deviation_pi.

Rasbats commented 3 years ago

Now working.

leamas commented 3 years ago

been away, on phone now. Good that it works for you. There is no more duplication, closing

leamas commented 3 years ago

BTW:

This has caused problems for vdr (again). I will try and edit sources.state and site.yml to reflect the fork in opencpn-manuals.

What I do:

In sources directory: Remove possibly existing clone of plugin to update
Still in sources: Clone the correct variant of plugin (complete clone)

Then, use source-state.sh to record the state of sources and commit:

 $ cd ..
 $ ./source-state.sh save
 $ git diff sources.state   # check that the new  (new fork of )plugin is properly recorded
 $ git add sources.state
 $ git commit -m "sources: Adding xxx"

rgleason commented 3 years ago

rausch.zip Is a sample file for VDR_pi

opencpn-manuals / plugins

Duplicated stuff #15

1

2