Clean code
This commit is contained in:
parent
449a855a6e
commit
bfacb8d313
|
|
@ -48,7 +48,6 @@ public class Drive {
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getVersion() {
|
public int getVersion() {
|
||||||
checkVersion();
|
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -84,8 +83,9 @@ public class Drive {
|
||||||
return getServer() + "/search?box=" + param + "&url=";
|
return getServer() + "/search?box=" + param + "&url=";
|
||||||
}
|
}
|
||||||
|
|
||||||
private void checkVersion() {
|
public Drive check() {
|
||||||
if (version == 0) setVersion(OkHttpUtil.string(settingsApi()).contains("v3.") ? 3 : 2);
|
if (getVersion() == 0) setVersion(OkHttpUtil.string(settingsApi()).contains("v3.") ? 3 : 2);
|
||||||
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
||||||
|
|
@ -48,7 +48,7 @@ public class AList extends Spider {
|
||||||
}
|
}
|
||||||
|
|
||||||
private Drive getDrive(String name) {
|
private Drive getDrive(String name) {
|
||||||
return drives.get(drives.indexOf(new Drive(name)));
|
return drives.get(drives.indexOf(new Drive(name))).check();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -119,7 +119,7 @@ public class AList extends Spider {
|
||||||
fetchRule();
|
fetchRule();
|
||||||
List<Vod> list = new ArrayList<>();
|
List<Vod> list = new ArrayList<>();
|
||||||
CountDownLatch cd = new CountDownLatch(drives.size());
|
CountDownLatch cd = new CountDownLatch(drives.size());
|
||||||
for (Drive drive : drives) new Thread(() -> search(cd, list, drive, keyword)).start();
|
for (Drive drive : drives) new Thread(() -> search(cd, list, drive.check(), keyword)).start();
|
||||||
cd.await();
|
cd.await();
|
||||||
return Result.string(list);
|
return Result.string(list);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -1 +1 @@
|
||||||
4c2c569b1472f4e040ebc6a2de961864
|
5013870b5cce8147c2a877f4da966cf0
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue