Skip to content

Commit 1bf217c

Browse files
author
nicol
committed
deviant fix one page results
1 parent 9ebdda3 commit 1bf217c

5 files changed

Lines changed: 17 additions & 11 deletions

File tree

src/main/java/org/magic/api/wallpaper/impl/DeviantArtWallpaperProvider.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public List<MTGWallpaper> search(String search) {
5858

5959
var offset = 0;
6060
var ret= readOffset(offset,search);
61-
while(ret.get("has_more").getAsBoolean())
61+
while(!ret.get("results").getAsJsonArray().isEmpty())
6262
{
6363
ret.get("results").getAsJsonArray().forEach(el->{
6464
try {
@@ -77,21 +77,17 @@ public List<MTGWallpaper> search(String search) {
7777
if(el.getAsJsonObject().get("author").getAsJsonObject().get("username")!=null)
7878
p.setAuthor(el.getAsJsonObject().get("author").getAsJsonObject().get("username").getAsString());
7979

80-
81-
8280
if(list.size()<getInt(LIMIT))
8381
list.add(p);
8482
}
85-
86-
8783
} catch (Exception e) {
8884
logger.error("Error for {} . error : {}",el,e.getMessage());
8985
}
9086
});
9187

92-
if(list.size()>=getInt(LIMIT))
93-
break;
94-
88+
if(list.size()>=getInt(LIMIT) || ret.get("next_offset").isJsonNull())
89+
break;
90+
9591
ret = readOffset(ret.get("next_offset").getAsInt(), search);
9692
}
9793

@@ -102,6 +98,9 @@ public List<MTGWallpaper> search(String search) {
10298
if(getBoolean("DATE_UPDATE_ORDER"))
10399
Collections.sort(list,Collections.reverseOrder());
104100

101+
102+
logger.info("{} return {} results", getName(), list.size());
103+
105104
return list;
106105
}
107106

src/main/java/org/magic/api/wallpaper/impl/FilesWallpaperProvider.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ public List<MTGWallpaper> search(String search) {
3939
list.add(w);
4040
notify(w);
4141
}
42+
43+
logger.info("{} return {} results", getName(), list.size());
4244
return list;
4345
} catch (Exception e) {
4446
logger.error(e);

src/main/java/org/magic/api/wallpaper/impl/GelbooruWallpaperProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,11 @@ public List<MTGWallpaper> search(String search) {
4949
ret.add(w);
5050

5151
if(ret.size()>=getInt("LIMIT"))
52-
return ret;
52+
break;
5353

5454
}
5555
}
56+
logger.info("{} return {} results", getName(), ret.size());
5657
return ret;
5758
}
5859

src/main/java/org/magic/api/wallpaper/impl/ImgUrWallPaperProvider.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ public List<MTGWallpaper> search(String search) {
9494
logger.error(ex);
9595
}
9696

97+
logger.info("{} return {} results", getName(), ret.size());
9798
return ret;
9899

99100
}

src/main/java/org/magic/api/wallpaper/impl/KonachanWallpaperProvider.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,10 @@ public List<MTGWallpaper> search(String search) {
2828
var arr = URLTools.extractAsJson(baseUrl).getAsJsonArray();
2929

3030
if(arr.isEmpty())
31+
{
32+
logger.info("{} return nothing", getName());
3133
return ret;
34+
}
3235

3336
for(var je : arr)
3437
{
@@ -45,12 +48,12 @@ public List<MTGWallpaper> search(String search) {
4548
ret.add(pic);
4649

4750
if(ret.size()>=getInt("LIMIT"))
48-
return ret;
51+
break;
4952

5053
}
5154
}
5255

53-
56+
logger.info("{} return {} results", getName(), ret.size());
5457
return ret;
5558
}
5659

0 commit comments

Comments
 (0)