Skip to content

Commit f33169d

Browse files
xiaojieonlyxiaojieonly
committed
修复GP配额使用情况显示出错的问题
1 parent 4cc243c commit f33169d

File tree

2 files changed

+249
-5
lines changed

2 files changed

+249
-5
lines changed

‎app/src/main/java/com/hippo/ehviewer/client/parser/EhHomeParser.java

+19-5
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
public class EhHomeParser {
1919
private static final String TAG = "EhHomeParser";
2020
private static final Pattern PATTERN_IMAGE_LIMIT = Pattern.compile("<p>You are currently at <strong>(\\d+)</strong> towards a limit of <strong>(\\d+)</strong>.</p>.+?<p>Reset Cost: <strong>(\\d+)</strong> GP</p>", Pattern.DOTALL);
21+
private static final Pattern PATTERN_IMAGE_LIMIT_NEW = Pattern.compile("<p>You are currently at <strong>(.+?)</strong> towards your account limit of <strong>(.+?)</strong>.</p>\n<p>You can reset your image quota by spending <strong>(.+?)</strong> GP.</p>", Pattern.DOTALL);
2122

2223
private static final String HOME_BOX = "homebox";
2324

@@ -80,16 +81,29 @@ private static void parseTotalGpGained(Element totalGpGained, HomeDetail homeDet
8081
}
8182

8283
private static void parseImageLimits(Element imageLimits, HomeDetail homeDetail) {
83-
Matcher matcher = PATTERN_IMAGE_LIMIT.matcher(imageLimits.html());
84+
String imageListsString = imageLimits.html();
85+
Matcher matcher = PATTERN_IMAGE_LIMIT_NEW.matcher(imageListsString);
8486
if (!matcher.find()) {
85-
return;
87+
matcher = PATTERN_IMAGE_LIMIT.matcher(imageListsString);
88+
if (!matcher.find()){
89+
return;
90+
}
8691
}
87-
long used = NumberUtils.parseLongSafely(matcher.group(1), -1L);
88-
long total = NumberUtils.parseLongSafely(matcher.group(2), -1L);
89-
long resetCost = NumberUtils.parseLongSafely(matcher.group(3), -1L);
92+
93+
long used = NumberUtils.parseLongSafely(getGroupIntString(1,matcher), -1L);
94+
long total = NumberUtils.parseLongSafely(getGroupIntString(2,matcher), -1L);
95+
long resetCost = NumberUtils.parseLongSafely(getGroupIntString(3,matcher), -1L);
9096
homeDetail.setUsed(used);
9197
homeDetail.setTotal(total);
9298
homeDetail.setResetCost(resetCost);
9399
}
94100

101+
private static String getGroupIntString(int index,Matcher matcher){
102+
String groupS = matcher.group(index);
103+
if (groupS!=null){
104+
return groupS.replaceAll(",","");
105+
}
106+
return "0";
107+
}
108+
95109
}

‎app/src/test/resources/com/hippo/ehviewer/client/parser/HomePageNew.html

+230
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,230 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<title>E-Hentai Galleries - The Free Hentai Doujinshi, Manga and Image Gallery System</title>
5+
<link rel="stylesheet" type="text/css" href="https://e-hentai.org/z/0372/g.css"/>
6+
<style type="text/css">
7+
h1{font-size:10pt;font-weight:bold;text-align:center;margin:3px}h2{font-size:10pt;font-weight:bold;text-align:center;margin:10px auto 3px}.stuffbox{min-width:600px;max-width:980px;margin:10px auto;padding:3px 3px 15px;font-size:10pt}.homebox{border:1px solid #5C0D12;width:600px;margin:auto;padding:3px}.c1{width:100px;font-weight:bold;text-align:right}.c2{width:120px;text-align:left;margin-bottom:2px}
8+
9+
</style>
10+
<meta name="description"
11+
content="With close to a million absolutely free hentai doujinshi, manga, cosplay and CG galleries, E-Hentai Galleries is the world's largest free Hentai archive."/>
12+
<meta name="RATING" content="RTA-5042-1996-1400-1577-RTA"/>
13+
<meta name="juicyads-site-verification" content="0f3e47704e352bf534e98d4d45411fda"/>
14+
<link rel="alternate" type="application/atom+xml" title="E-Hentai Galleries Content Feed"
15+
href="https://e-hentai.org/rss/ehg.xml"/>
16+
<link rel="alternate" type="application/atom+xml" title="EHTracker Torrent Feed"
17+
href="https://e-hentai.org/rss/ehtracker.xml"/>
18+
<link rel="search" href="https://ehgt.org/g/opensearchdescription.xml"
19+
type="application/opensearchdescription+xml" title="E-Hentai Galleries Search"/>
20+
</head>
21+
<body>
22+
<script type="text/javascript">
23+
function popUp(URL,w,h) {
24+
window.open(URL,"_pu"+(Math.random()+"").replace(/0\./,""),"toolbar=0,scrollbars=0,location=0,statusbar=0,menubar=0,resizable=0,width="+w+",height="+h+",left="+((screen.width-w)/2)+",top="+((screen.height-h)/2));
25+
return false;
26+
}
27+
28+
</script>
29+
<div id="nb" class="nosel">
30+
<div><a href="https://e-hentai.org/">Front<span class="nbw"> Page</span></a></div>
31+
<div><a href="https://e-hentai.org/watched">Watched</a></div>
32+
<div><a href="https://e-hentai.org/popular">Popular</a></div>
33+
<div><a href="https://e-hentai.org/torrents.php">Torrents</a></div>
34+
<div><a href="https://e-hentai.org/favorites.php">Fav<span class="nbw">orite</span>s</a></div>
35+
<div><a href="https://e-hentai.org/home.php"><span class="nbw">My </span>Home</a></div>
36+
<div><a href="https://upld.e-hentai.org/manage"><span class="nbw">My </span>Uploads</a></div>
37+
<div><a href="https://e-hentai.org/toplist.php">Toplists</a></div>
38+
<div><a href="https://e-hentai.org/bounty.php">Bounties</a></div>
39+
<div><a href="https://e-hentai.org/news.php">News</a></div>
40+
<div class="nbw"><a href="https://forums.e-hentai.org/">Forums</a></div>
41+
<div class="nbw"><a href="https://ehwiki.org/">Wiki</a></div>
42+
<div class="nbw"><a href="https://hentaiverse.org/"
43+
onclick="popUp('https://hentaiverse.org/',1250,720); return false">HentaiVerse</a>
44+
</div>
45+
</div>
46+
<div id="lb">
47+
<div>[<a href="https://e-hentai.org/home.php" style="font-weight:bold">Overview</a>]</div>
48+
<div>[<a href="https://e-hentai.org/stats.php">My Stats</a>]</div>
49+
<div>[<a href="https://e-hentai.org/uconfig.php">My Settings</a>]</div>
50+
<div>[<a href="https://e-hentai.org/mytags">My Tags</a>]</div>
51+
<div>[<a href="https://e-hentai.org/hentaiathome.php">Hentai@Home</a>]</div>
52+
<div>[<a href="https://e-hentai.org/bitcoin.php">Donations</a>]</div>
53+
<div>[<a href="https://e-hentai.org/hathperks.php">Hath Perks</a>]</div>
54+
<div>[<a href="https://e-hentai.org/exchange.php?t=hath">Hath Exchange</a>]</div>
55+
<div>[<a href="https://e-hentai.org/exchange.php?t=gp">GP Exchange</a>]</div>
56+
<div>[<a href="https://e-hentai.org/logs.php?t=credits">Credit Log</a>]</div>
57+
<div>[<a href="https://e-hentai.org/logs.php?t=karma">Karma Log</a>]</div>
58+
</div>
59+
<div class="stuffbox">
60+
61+
<h2>Image Limits</h2>
62+
63+
<div class="homebox">
64+
<p>Due to widespread usage of bulk downloaders, high-resolution images can be limited.</p>
65+
<p>You are currently at <strong>538</strong> towards your account limit of
66+
<strong>50,000</strong>.</p>
67+
<p>You can reset your image quota by spending <strong>1,076</strong> GP.</p>
68+
69+
<form action="" method="post">
70+
<p><input type="submit" name="reset_imagelimit" value="Reset Quota"
71+
style="width:120px"/></p>
72+
</form>
73+
74+
75+
</div>
76+
77+
78+
<h2>EHTracker</h2>
79+
80+
<div class="homebox">
81+
<table style="margin:10px auto">
82+
<tr>
83+
<td class="c1">1.82 GiB</td>
84+
<td class="c2"> uploaded</td>
85+
<td class="c1">0.00 B</td>
86+
<td class="c2">downloaded</td>
87+
<td class="c1" style="color:black">&infin;</td>
88+
<td class="c2">up/down ratio</td>
89+
</tr>
90+
<tr>
91+
<td class="c1">282</td>
92+
<td class="c2">torrent completes</td>
93+
<td class="c1">622</td>
94+
<td class="c2">gallery completes</td>
95+
<td class="c1">66,853</td>
96+
<td class="c2">seedmins</td>
97+
</tr>
98+
</table>
99+
100+
<div style="margin:10px auto"><a href="https://e-hentai.org/torrents.php?u=4596468">Show My
101+
Torrents</a></div>
102+
103+
<p>If you misplace any of your personalized torrents, hit the button below to reset your
104+
key.<br/>This will immediately invalidate all of your personalized torrents in play.</p>
105+
<p>Your current key is: <span style="font-weight:bold">gGwtEuYww9</span></p>
106+
107+
<form action="" method="post">
108+
<p><input type="submit" name="reset_torrent_key" value="Reset Torrent Key"
109+
onclick="return confirm('Are you sure you wish to reset your key? This action cannot be undone.')"
110+
style="width:120px; padding-bottom:3px"/></p>
111+
</form>
112+
</div>
113+
114+
115+
<h2>Total GP Gained</h2>
116+
117+
<div class="homebox">
118+
<table style="margin:auto; text-align:left">
119+
<tr>
120+
<td style="font-weight:bold; text-align:right">306,261</td>
121+
<td>GP from gallery visits</td>
122+
</tr>
123+
<tr>
124+
<td style="font-weight:bold; text-align:right">27,176</td>
125+
<td>GP from torrent completions</td>
126+
</tr>
127+
<tr>
128+
<td style="font-weight:bold; text-align:right">75,999</td>
129+
<td>GP from archive downloads</td>
130+
</tr>
131+
<tr>
132+
<td style="font-weight:bold; text-align:right">0</td>
133+
<td>GP from Hentai@Home</td>
134+
</tr>
135+
</table>
136+
</div>
137+
138+
139+
<h2>Toplists</h2>
140+
141+
<div class="homebox">
142+
<table style="text-align:left; margin:auto">
143+
<td style="vertical-align:top; padding-top:4px"></td>
144+
<td>
145+
You are currently not featured on any toplists...
146+
</td>
147+
</table>
148+
</div>
149+
150+
151+
<h2>Moderation Power</h2>
152+
153+
<div class="homebox">
154+
<table style="margin:auto; width:100%">
155+
<tr>
156+
<td style="width:50%; vertical-align:top; padding-top:35px; border-right:1px solid #5C0D12">
157+
<div>Current Moderation Power</div>
158+
<div style="margin-top:5px; font-size:14pt; font-weight:bold">13</div>
159+
</td>
160+
<td>
161+
<table style="text-align:right; margin:auto">
162+
<tr>
163+
<td>Base</td>
164+
<td style="font-weight:bold">+1</td>
165+
</tr>
166+
<tr>
167+
<td>Awards</td>
168+
<td style="font-weight:bold">+0</td>
169+
</tr>
170+
<tr>
171+
<td>Tagging</td>
172+
<td style="font-weight:bold">+0</td>
173+
</tr>
174+
<tr>
175+
<td>&nbsp;</td>
176+
<td style="font-weight:bold">= 1</td>
177+
</tr>
178+
<tr>
179+
<td>&nbsp;</td>
180+
<td style="font-weight:bold">&nbsp;</td>
181+
</tr>
182+
<tr>
183+
<td>&nbsp;</td>
184+
<td style="font-weight:bold">&nbsp;</td>
185+
</tr>
186+
</table>
187+
</td>
188+
<td>
189+
<table style="text-align:right; margin:auto">
190+
<tr>
191+
<td>Level</td>
192+
<td style="font-weight:bold">+3.46</td>
193+
</tr>
194+
<tr>
195+
<td>Donations</td>
196+
<td style="font-weight:bold">+3</td>
197+
</tr>
198+
<tr>
199+
<td>Forum Activity</td>
200+
<td style="font-weight:bold">+0.03</td>
201+
</tr>
202+
<tr>
203+
<td>Uploads/H@H</td>
204+
<td style="font-weight:bold">+0.03</td>
205+
</tr>
206+
<tr>
207+
<td>Account Age</td>
208+
<td style="font-weight:bold">+5</td>
209+
</tr>
210+
<tr>
211+
<td>(capped to 25)</td>
212+
<td style="font-weight:bold">= 11.52</td>
213+
</tr>
214+
</table>
215+
</td>
216+
</tr>
217+
</table>
218+
</div>
219+
220+
</div>
221+
<div class="dp">
222+
<a href="https://e-hentai.org/">Front</a>
223+
&nbsp; <a href="https://e-hentai.org/lofi/">LoFi</a> &nbsp; <a
224+
href="https://forums.e-hentai.org/">Forums</a> &nbsp; <a href="https://hentaiverse.org/">HentaiVerse</a>
225+
&nbsp; <a href="https://ehwiki.org/">Wiki</a> &nbsp; <a href="https://twitter.com/ehentai">Twitter</a>
226+
&nbsp; <a href="https://e-hentai.org/tos.php">ToS</a> &nbsp; <a href="mailto:[email protected]">Advertise</a>
227+
228+
</div>
229+
</body>
230+
</html>

0 commit comments

Comments
 (0)