From 18582c535a34f69e83b5ed29f7e3912c08fc7213 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 10 Jul 2022 14:32:27 +0300 Subject: [PATCH] reformated code --- .../lite/downloaders/VideoDownloader.java | 8 +++--- .../lite/downloaders/music/Callback.java | 5 +++- .../lite/downloaders/music/M3UDownloader.java | 22 +++++++-------- .../vtosters/lite/music/TransportStream.java | 22 +++++++-------- .../ru/vtosters/lite/music/VKM3UParser.java | 28 +++++++++---------- .../java/ru/vtosters/lite/utils/Globals.java | 14 ++++++++-- .../vtosters/lite/utils/Multithreading.java | 12 ++++++++ 7 files changed, 68 insertions(+), 43 deletions(-) create mode 100644 app/src/main/java/ru/vtosters/lite/utils/Multithreading.java diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java index dff7482b2..a2f13d0d5 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/VideoDownloader.java @@ -28,16 +28,16 @@ import java.util.Objects; public class VideoDownloader{ private static final int action_id = 1488; - public static boolean onClick(int id, VideoFile video, Context ctx) { - if (id == action_id) { + public static boolean onClick(int id, VideoFile video, Context ctx){ + if(id == action_id){ downloadVideo(video, ctx); return true; } return false; } - public static void injectAction(ArrayList list, VideoFile video) { - if (!video.U && !video.I1()) { + public static void injectAction(ArrayList list, VideoFile video){ + if(!video.U && !video.I1()){ MenuBottomSheetAction downloadAction = new MenuBottomSheetAction( action_id, com.vtosters.lite.R.drawable.ic_download_outline_24, diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/music/Callback.java b/app/src/main/java/ru/vtosters/lite/downloaders/music/Callback.java index e4a7b1767..efd5abd6d 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/music/Callback.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/music/Callback.java @@ -1,8 +1,11 @@ package ru.vtosters.lite.downloaders.music; -public interface Callback { +public interface Callback{ void onProgress(int progress); + void onSuccess(); + void onFailure(); + void onSizeReceived(long size, long header); } diff --git a/app/src/main/java/ru/vtosters/lite/downloaders/music/M3UDownloader.java b/app/src/main/java/ru/vtosters/lite/downloaders/music/M3UDownloader.java index c264f9adb..2e2d7bc05 100644 --- a/app/src/main/java/ru/vtosters/lite/downloaders/music/M3UDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/downloaders/music/M3UDownloader.java @@ -12,27 +12,27 @@ import java.util.List; import javax.crypto.NoSuchPaddingException; -import ru.vtosters.lite.utils.StreamUtils; import ru.vtosters.lite.music.TransportStream; import ru.vtosters.lite.music.VKM3UParser; +import ru.vtosters.lite.utils.StreamUtils; -public class M3UDownloader { - - private String mURL; - private File mOutDir; - private Callback mCallback; - - public M3UDownloader(String url, File outDir, Callback callback) { +public class M3UDownloader{ + + private final String mURL; + private final File mOutDir; + private final Callback mCallback; + + public M3UDownloader(String url, File outDir, Callback callback){ mURL = url; mOutDir = outDir; mCallback = callback; } - - public void execute() { + + public void execute(){ VKM3UParser parser = new VKM3UParser(mURL); List tses = parser.getTransportStreams(); mCallback.onProgress(5); - for (TransportStream ts : tses) { + for(TransportStream ts : tses) { String tsURL = parser.getBaseUrl() + ts.getName(); Log.d("M3UDownloader", "Downloading " + tsURL); try { diff --git a/app/src/main/java/ru/vtosters/lite/music/TransportStream.java b/app/src/main/java/ru/vtosters/lite/music/TransportStream.java index 85b26347b..c996751eb 100644 --- a/app/src/main/java/ru/vtosters/lite/music/TransportStream.java +++ b/app/src/main/java/ru/vtosters/lite/music/TransportStream.java @@ -1,36 +1,36 @@ package ru.vtosters.lite.music; -public class TransportStream { +public class TransportStream{ public static final String METHOD_NONE = "NONE"; public static final String METHOD_AES128 = "AES-128"; - private String mMethod; + private final String mMethod; private String mName; private String mKeyURL; - public TransportStream() { + public TransportStream(){ this.mMethod = METHOD_NONE; } - public TransportStream(String method, String keyURL) { + public TransportStream(String method, String keyURL){ this.mMethod = method; this.mKeyURL = keyURL; } - public void setName(String name) { - mName = name; - } - - public String getMethod() { + public String getMethod(){ return mMethod; } - public String getName() { + public String getName(){ return mName; } - public String getKeyURL() { + public void setName(String name){ + mName = name; + } + + public String getKeyURL(){ return mKeyURL; } } diff --git a/app/src/main/java/ru/vtosters/lite/music/VKM3UParser.java b/app/src/main/java/ru/vtosters/lite/music/VKM3UParser.java index a521dd20b..2857da95b 100644 --- a/app/src/main/java/ru/vtosters/lite/music/VKM3UParser.java +++ b/app/src/main/java/ru/vtosters/lite/music/VKM3UParser.java @@ -4,7 +4,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Scanner; -public class VKM3UParser { +public class VKM3UParser{ private final String mData; private final List mTransportStreams = new ArrayList<>(); @@ -13,23 +13,23 @@ public class VKM3UParser { private int mHeapSize = 0; private String mBaseURL; - public VKM3UParser(String data) { + public VKM3UParser(String data){ mData = data; init(); } - private void init() { + private void init(){ int i = 0; Scanner scanner = new Scanner(mData); - while (scanner.hasNext()) { + while(scanner.hasNext()) { String line = scanner.nextLine(); mHeapSize += line.getBytes().length; - if (line.startsWith("#EXT-X-TARGETDURATION")) { + if(line.startsWith("#EXT-X-TARGETDURATION")){ mDuration = Integer.parseInt(getDirectiveValue(line)); - } else if (line.startsWith("#EXT-X-KEY")) { + } else if(line.startsWith("#EXT-X-KEY")){ String base = getDirectiveValue(line); final TransportStream ts; - if (!base.startsWith("METHOD=NONE")) { + if(!base.startsWith("METHOD=NONE")){ String keyURL = base.substring(base.indexOf("\"") + 1, base.lastIndexOf("\"")); mBaseURL = keyURL.substring(0, keyURL.lastIndexOf("/") + 1); ts = new TransportStream(TransportStream.METHOD_AES128, keyURL); @@ -37,29 +37,29 @@ public class VKM3UParser { ts = new TransportStream(); } mTransportStreams.add(ts); - } else if (line.startsWith("#EXTINF")) { - if (mTransportStreams.size() == i) + } else if(line.startsWith("#EXTINF")){ + if(mTransportStreams.size() == i) mTransportStreams.add(new TransportStream()); - } else if (line.endsWith(".ts") || line.endsWith(".tp") || line.endsWith(".mpeg-ts") || line.endsWith(".m2ts")) { + } else if(line.endsWith(".ts") || line.endsWith(".tp") || line.endsWith(".mpeg-ts") || line.endsWith(".m2ts")){ mTransportStreams.get(i).setName(line); ++i; } } } - private String getDirectiveValue(String directive) { + private String getDirectiveValue(String directive){ return directive.substring(directive.indexOf(":") + 1); } - public int getHeapSize() { + public int getHeapSize(){ return mHeapSize; } - public String getBaseUrl() { + public String getBaseUrl(){ return mBaseURL; } - public List getTransportStreams() { + public List getTransportStreams(){ return mTransportStreams; } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Globals.java b/app/src/main/java/ru/vtosters/lite/utils/Globals.java index 3d2027e2e..402b98a3f 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Globals.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Globals.java @@ -184,9 +184,9 @@ public class Globals{ InputStream is = conn.getInputStream(); Bitmap bmp = BitmapFactory.decodeStream(is); - bmp = rounded? getBitmapClippedCircle(bmp) : bmp; // rounding + bmp = rounded ? getBitmapClippedCircle(bmp) : bmp; // rounding - bmp = scaled? createScaledBitmap(bmp, convertDpToPixel(256), convertDpToPixel(256), true) : bmp; // scaling + bmp = scaled ? createScaledBitmap(bmp, convertDpToPixel(256), convertDpToPixel(256), true) : bmp; // scaling return new BitmapDrawable(getResources(), bmp); // return our drawable } catch (Exception e) { @@ -401,4 +401,14 @@ public class Globals{ int centerHeight = height / 2; return new float[]{centerWidth, centerHeight}; } + + int[] toIntArray(List list){ + int[] ret = new int[list.size()]; + int i = 0; + for(Integer e : list) { + /*if (e < 2000000000)*/ + ret[i++] = e; + } + return ret; + } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Multithreading.java b/app/src/main/java/ru/vtosters/lite/utils/Multithreading.java new file mode 100644 index 000000000..de0c22f53 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/utils/Multithreading.java @@ -0,0 +1,12 @@ +package ru.vtosters.lite.utils; +import android.os.Handler; +import android.os.Looper; + +public class Multithreading{ + private static final Handler ui = new Handler(Looper.getMainLooper()); + + public static void runOnUi(Runnable run){ + ui.post(run); + } + +}