Update webdav format
This commit is contained in:
parent
cc5dc7fdcf
commit
59985eced5
|
|
@ -8,17 +8,16 @@ import com.github.catvod.bean.Vod;
|
||||||
import com.github.catvod.utils.Util;
|
import com.github.catvod.utils.Util;
|
||||||
import com.google.gson.Gson;
|
import com.google.gson.Gson;
|
||||||
import com.google.gson.annotations.SerializedName;
|
import com.google.gson.annotations.SerializedName;
|
||||||
|
import com.google.gson.reflect.TypeToken;
|
||||||
import com.thegrizzlylabs.sardineandroid.DavResource;
|
import com.thegrizzlylabs.sardineandroid.DavResource;
|
||||||
import com.thegrizzlylabs.sardineandroid.Sardine;
|
import com.thegrizzlylabs.sardineandroid.Sardine;
|
||||||
import com.thegrizzlylabs.sardineandroid.impl.OkHttpSardine;
|
import com.thegrizzlylabs.sardineandroid.impl.OkHttpSardine;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.lang.reflect.Type;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
public class Drive {
|
public class Drive {
|
||||||
|
|
||||||
@SerializedName("drives")
|
|
||||||
private List<Drive> drives;
|
|
||||||
@SerializedName("name")
|
@SerializedName("name")
|
||||||
private String name;
|
private String name;
|
||||||
@SerializedName("server")
|
@SerializedName("server")
|
||||||
|
|
@ -32,18 +31,15 @@ public class Drive {
|
||||||
@SerializedName("webdav")
|
@SerializedName("webdav")
|
||||||
private Sardine webdav;
|
private Sardine webdav;
|
||||||
|
|
||||||
public static Drive objectFrom(String str) {
|
public static List<Drive> arrayFrom(String str) {
|
||||||
return new Gson().fromJson(str, Drive.class);
|
Type listType = new TypeToken<List<Drive>>() {}.getType();
|
||||||
|
return new Gson().fromJson(str, listType);
|
||||||
}
|
}
|
||||||
|
|
||||||
public Drive(String name) {
|
public Drive(String name) {
|
||||||
this.name = name;
|
this.name = name;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Drive> getDrives() {
|
|
||||||
return drives == null ? new ArrayList<>() : drives;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getName() {
|
public String getName() {
|
||||||
return TextUtils.isEmpty(name) ? "" : name;
|
return TextUtils.isEmpty(name) ? "" : name;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,7 @@ public class WebDAV extends Spider {
|
||||||
private void fetchRule() {
|
private void fetchRule() {
|
||||||
if (drives != null && !drives.isEmpty()) return;
|
if (drives != null && !drives.isEmpty()) return;
|
||||||
if (extend.startsWith("http")) extend = OkHttp.string(extend);
|
if (extend.startsWith("http")) extend = OkHttp.string(extend);
|
||||||
Drive drive = Drive.objectFrom(extend);
|
drives = Drive.arrayFrom(extend);
|
||||||
drives = drive.getDrives();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private String getExt(DavResource item) {
|
private String getExt(DavResource item) {
|
||||||
|
|
|
||||||
|
|
@ -1,16 +1,14 @@
|
||||||
{
|
[
|
||||||
"drives": [
|
{
|
||||||
{
|
"name": "七米藍",
|
||||||
"name": "七米藍",
|
"server": "https://al.chirmyram.com/dav",
|
||||||
"server": "https://al.chirmyram.com/dav",
|
"user": "alist",
|
||||||
"user": "alist",
|
"pass": "alist"
|
||||||
"pass": "alist"
|
},
|
||||||
},
|
{
|
||||||
{
|
"name": "影視庫",
|
||||||
"name": "影視庫",
|
"server": "https://esir.eu.org/dav",
|
||||||
"server": "https://esir.eu.org/dav",
|
"user": "alist",
|
||||||
"user": "alist",
|
"pass": "alist"
|
||||||
"pass": "alist"
|
}
|
||||||
}
|
]
|
||||||
]
|
|
||||||
}
|
|
||||||
Loading…
Reference in New Issue