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

Jump to bottom

rewrite strip_nastyhtml, strip_html in Qt #1341

Draft
wants to merge 13 commits into
base: master
Choose a base branch
from
Draft

rewrite strip_nastyhtml, strip_html in Qt #1341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ff59506
rewrite strip_html with QString.
tsteven4 Sep 14, 2024
28970bb
rewrite strip_nasty_html in Qt.
tsteven4 Sep 14, 2024
cb110d2
cleanup comment xstrdup
tsteven4 Sep 15, 2024
677da95
use regex for strip_html
tsteven4 Sep 15, 2024
40fe2ef
strip_html deletes other tags
tsteven4 Sep 15, 2024
b0440f7
fix strip_html img tag handling
tsteven4 Sep 15, 2024
06c9727
Revert "fix strip_html img tag handling"
tsteven4 Sep 15, 2024
f5eeaeb
Revert "strip_html deletes other tags"
tsteven4 Sep 15, 2024
a10ab75
Revert "use regex for strip_html"
tsteven4 Sep 15, 2024
7281389
implement strip_html using QRegularExpressionMatchIterator.
tsteven4 Sep 15, 2024
8e722ae
a little cleanup
tsteven4 Sep 15, 2024
08bb082
remove obsolete include
tsteven4 Sep 15, 2024
06b8027
take care to distinguish tags with common roots
tsteven4 Sep 15, 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
2 changes: 1 addition & 1 deletion exif.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
#include <cstring> // for memcmp, strlen
#include <utility> // for as_const

#include "defs.h" // for Waypoint, fatal, warning, global_options, global_opts, unknown_alt, xfree, route_disp_all, track_disp_all, waypt_disp_all, wp_flags, KNOTS_TO_MPS, KPH_TO_MPS, MPH_TO_MPS, MPS_TO_KPH, WAYPT_HAS, case_ignore_strcmp, waypt_add, xstrdup, fix_2d
#include "defs.h" // for Waypoint, fatal, warning, global_options, global_opts, unknown_alt, xfree, route_disp_all, track_disp_all, waypt_disp_all, wp_flags, KNOTS_TO_MPS, KPH_TO_MPS, MPH_TO_MPS, MPS_TO_KPH, WAYPT_HAS, case_ignore_strcmp, waypt_add, fix_2d
#include "garmin_tables.h" // for gt_lookup_datum_index
#include "gbfile.h" // for gbfputuint32, gbfputuint16, gbfgetuint16, gbfgetuint32, gbfseek, gbftell, gbfile, gbfclose, gbfcopyfrom, gbfwrite, gbfopen_be, gbfread, gbfrewind, gbfgetflt, gbfgetint16, gbfopen, gbfputc, gbfputflt, gbsize_t, gbfeof, gbfgetdbl, gbfputdbl, gbfile::(anonymous)
#include "jeeps/gpsmath.h" // for GPS_Math_WGS84_To_Known_Datum_M
Expand Down
80 changes: 80 additions & 0 deletions reference/gc/GCGCA8_nasty.gpx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
<?xml version="1.0" encoding="utf-8"?>
<gpx xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0" creator="Groundspeak, Inc. All Rights Reserved. http://www.groundspeak.com" xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd http://www.groundspeak.com/cache/1/0/1 http://www.groundspeak.com/cache/1/0/1/cache.xsd" xmlns="http://www.topografix.com/GPX/1/0">
<name>Cache Listing Generated from Geocaching.com</name>
<desc>This is an individual cache generated from Geocaching.com</desc>
<author>Account "robertlipe" From Geocaching.com</author>
<email>[email protected]</email>
<url>https://www.geocaching.com</url>
<urlname>Geocaching - High Tech Treasure Hunting</urlname>
<time>2023-10-25T00:44:53.7176739Z</time>
<keywords>cache, geocache</keywords>
<bounds minlat="35.921667" minlon="-86.861667" maxlat="35.921667" maxlon="-86.861667" />
<wpt lat="35.921667" lon="-86.861667">
<time>2003-06-29T00:00:00</time>
<name>GCGCA8</name>
<desc>Oozy rat in a sanitary zoo by robertlipe, Unknown Cache (3/2)</desc>
<url>https://www.geocaching.com/geocache/GCGCA8</url>
<urlname>Oozy rat in a sanitary zoo</urlname>
<sym>Geocache</sym>
<type>Geocache|Unknown Cache</type>
<groundspeak:cache id="77386" available="False" archived="True" xmlns:groundspeak="http://www.groundspeak.com/cache/1/0/1">
<groundspeak:name>Oozy rat in a sanitary zoo</groundspeak:name>
<groundspeak:placed_by>robertlipe</groundspeak:placed_by>
<groundspeak:owner id="32733">robertlipe</groundspeak:owner>
<groundspeak:type>Unknown Cache</groundspeak:type>
<groundspeak:container>Not chosen</groundspeak:container>
<groundspeak:attributes>
<groundspeak:attribute id="24" inc="0">Wheelchair accessible</groundspeak:attribute>
<groundspeak:attribute id="19" inc="1">Ticks</groundspeak:attribute>
<groundspeak:attribute id="18" inc="1">Dangerous animals</groundspeak:attribute>
<groundspeak:attribute id="17" inc="1">Poisonous plants</groundspeak:attribute>
<groundspeak:attribute id="39" inc="1">Thorns</groundspeak:attribute>
<groundspeak:attribute id="30" inc="1">Picnic tables nearby</groundspeak:attribute>
<groundspeak:attribute id="28" inc="1">Public restrooms nearby</groundspeak:attribute>
<groundspeak:attribute id="1" inc="1">Dogs</groundspeak:attribute>
</groundspeak:attributes>
<groundspeak:difficulty>3</groundspeak:difficulty>
<groundspeak:terrain>2</groundspeak:terrain>
<groundspeak:country>United States</groundspeak:country>
<groundspeak:state>Tennessee</groundspeak:state>
<groundspeak:short_description html="True">&lt;body&gt;The cache is &lt;style&gt;
not&lt;/style&gt; at the coordinates above. These coords will get
you to the correct park and within 1/2 mile of the cache. The cache
is within 35 feet of the trail. It is not handicapped accessible.
It is a nice walk in the woods that is practical for all ages.
There is no space in the container for trading items. You should
bring a writing stick and bug spray is recommended.&lt;/body&gt;
</groundspeak:short_description>
<groundspeak:long_description html="True">&lt;html&gt;&lt;body text="color"&gt;So if the cache isn't at the above coordinates, where is it?
&lt;ul&gt;
&lt;li&gt;Too bad I hid a boot&lt;/li&gt;
&lt;li&gt;Too hot to hoot&lt;/li&gt;
&lt;li&gt;Never odd or even&lt;/li&gt;
&lt;li&gt;Do geese see God?&lt;/li&gt;
&lt;li&gt;"Do nine men interpret?" "Nine men," I nod&lt;/li&gt;
&lt;li&gt;Rats live on no evil star&lt;/li&gt;
&lt;li&gt;Go hang a salami, I'm a lasagna hog&lt;/li&gt;&lt;/ul&gt;
Now that it's intuitively obvious to even the most casual observer
where the cache is, turn on your geo-mojo and go find it. &lt;br&gt;
&lt;image src="http://www.mtgc.org/mtgc_member-banner.gif" width="500"
height="40" alt=
"Member of Middle Tennessee GeoCachers Club [www.mtgc.org]"
border="0"&gt;&lt;br&gt;
&lt;br&gt;&lt;/body&gt;&lt;/html&gt;
</groundspeak:long_description>
<groundspeak:encoded_hints>
</groundspeak:encoded_hints>
<groundspeak:logs>
<groundspeak:log id="732879189">
<groundspeak:date>2017-11-11T01:44:14Z</groundspeak:date>
<groundspeak:type>Archive</groundspeak:type>
<groundspeak:finder id="32733">robertlipe</groundspeak:finder>
<groundspeak:text encoded="False">Removed the container from the final location. Enough construction has occurred since this was placed to make it much less of an adventure than is used to be, so I'm archiving.

Thanx to all that hunted it.</groundspeak:text>
</groundspeak:log>
</groundspeak:logs>
<groundspeak:travelbugs />
</groundspeak:cache>
</wpt>
</gpx>
55 changes: 55 additions & 0 deletions reference/gc/GCGCA8_nasty.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
<title>GPSBabel HTML Output</title>
<style>
p.gpsbabelwaypoint { font-size: 120%; font-weight: bold }
</style>
</head>
<body>
<p class="index">
<a href="#WPT001">GCGCA8 - Oozy rat in a sanitary zoo</a><br>
</p>
<div id="WPT001"><hr>
<table style="width:100%">
<tr>
<td>
<p class="gpsbabelwaypoint">GCGCA8 - N35&deg;55.300 W86&deg;51.700 (16S 512480 3975269)<br>
<a href="https://www.geocaching.com/geocache/GCGCA8">Oozy rat in a sanitary zoo</a> by robertlipe</p>
</td>
<td style="text-align:right">
<p class="gpsbabelcacheinfo">3 / 2<br>
Unknown Cache / Unknown</p>
</td>
</tr>
<tr>
<td colspan="2">
<div><p class="gpsbabeldescshort">The cache is at the coordinates above. These coords will get
you to the correct park and within 1/2 mile of the cache. The cache
is within 35 feet of the trail. It is not handicapped accessible.
It is a nice walk in the woods that is practical for all ages.
There is no space in the container for trading items. You should
bring a writing stick and bug spray is recommended.</div>
<div><p class="gpsbabeldesclong">So if the cache isn't at the above coordinates, where is it?
<ul>
<li>Too bad I hid a boot</li>
<li>Too hot to hoot</li>
<li>Never odd or even</li>
<li>Do geese see God?</li>
<li>"Do nine men interpret?" "Nine men," I nod</li>
<li>Rats live on no evil star</li>
<li>Go hang a salami, I'm a lasagna hog</li></ul>
Now that it's intuitively obvious to even the most casual observer
where the cache is, turn on your geo-mojo and go find it. <br>
<img src="http://www.mtgc.org/mtgc_member-banner.gif" width="500"
height="40" alt=
"Member of Middle Tennessee GeoCachers Club [www.mtgc.org]"
border="0"><br>
<br></div>
</td>
</tr>
</table>
</div>
</body>
</html>
1 change: 1 addition & 0 deletions testo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,4 +189,5 @@ if [ -z "${VALGRIND}" ]; then
fi
fi

echo "Total Errors: $errorcount"
exit $errorcount
4 changes: 4 additions & 0 deletions testo.d/text.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ gpsbabel -i gpx -f ${REFERENCE}/gc/GC7FA4.gpx \
-o text,logs -F ${TMPDIR}/GC7FA4.text
compare ${REFERENCE}/gc/GC7FA4.html ${TMPDIR}/GC7FA4.html
compare ${REFERENCE}/gc/GC7FA4.text ${TMPDIR}/GC7FA4.text

# GCGC8_nasty.gpx is hand modifed to test strip_nasty_html
gpsbabel -i gpx -f ${REFERENCE}/gc/GCGCA8_nasty.gpx -o html -F ${TMPDIR}/GCGCA8_nasty.html
compare ${REFERENCE}/gc/GCGCA8_nasty.html ${TMPDIR}/GCGCA8_nasty.html
Loading
Loading