From fccf4db163bb00a0b39626748c7c9346540f83a4 Mon Sep 17 00:00:00 2001 From: tarsin Date: Thu, 26 Jan 2023 17:56:05 +0800 Subject: [PATCH] Migrate to androidx collection, step 3 --- .../ehviewer/download/DownloadManager.kt | 6 +- .../yorozuya/collect/ContainerHelpers.java | 81 ------ .../hippo/yorozuya/collect/SparseIJArray.java | 254 ------------------ 3 files changed, 3 insertions(+), 338 deletions(-) delete mode 100644 app/src/main/java/com/hippo/yorozuya/collect/ContainerHelpers.java delete mode 100644 app/src/main/java/com/hippo/yorozuya/collect/SparseIJArray.java diff --git a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt index 1db8d0699..b88255cf4 100644 --- a/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt +++ b/app/src/main/java/com/hippo/ehviewer/download/DownloadManager.kt @@ -19,6 +19,7 @@ import android.annotation.SuppressLint import android.os.AsyncTask import android.util.Log import androidx.collection.LongSparseArray +import androidx.collection.SparseArrayCompat import com.hippo.ehviewer.EhDB import com.hippo.ehviewer.client.data.BaseGalleryInfo import com.hippo.ehviewer.client.data.GalleryInfo @@ -35,7 +36,6 @@ import com.hippo.yorozuya.MathUtils import com.hippo.yorozuya.ObjectUtils import com.hippo.yorozuya.SimpleHandler import com.hippo.yorozuya.collect.LongList -import com.hippo.yorozuya.collect.SparseIJArray import java.io.IOException import java.util.LinkedList @@ -1130,8 +1130,8 @@ class DownloadManager : OnSpiderListener { } internal inner class SpeedReminder : Runnable { - private val mContentLengthMap = SparseIJArray() - private val mReceivedSizeMap = SparseIJArray() + private val mContentLengthMap = SparseArrayCompat() + private val mReceivedSizeMap = SparseArrayCompat() private var mStop = true private var mBytesRead: Long = 0 private var oldSpeed: Long = -1 diff --git a/app/src/main/java/com/hippo/yorozuya/collect/ContainerHelpers.java b/app/src/main/java/com/hippo/yorozuya/collect/ContainerHelpers.java deleted file mode 100644 index ddc20ea9b..000000000 --- a/app/src/main/java/com/hippo/yorozuya/collect/ContainerHelpers.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (C) 2013 The Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hippo.yorozuya.collect; - -import java.util.Comparator; - -public class ContainerHelpers { - - // This is Arrays.binarySearch(), but doesn't do any argument validation. - public static int binarySearch(int[] array, int size, int value) { - int lo = 0; - int hi = size - 1; - - while (lo <= hi) { - final int mid = (lo + hi) >>> 1; - final int midVal = array[mid]; - - if (midVal < value) { - lo = mid + 1; - } else if (midVal > value) { - hi = mid - 1; - } else { - return mid; // value found - } - } - return ~lo; // value not present - } - - public static int binarySearch(long[] array, int size, long value) { - int lo = 0; - int hi = size - 1; - - while (lo <= hi) { - final int mid = (lo + hi) >>> 1; - final long midVal = array[mid]; - - if (midVal < value) { - lo = mid + 1; - } else if (midVal > value) { - hi = mid - 1; - } else { - return mid; // value found - } - } - return ~lo; // value not present - } - - public static int binarySearch(T[] array, int size, T value, - Comparator comparator) { - int lo = 0; - int hi = size - 1; - - while (lo <= hi) { - final int mid = (lo + hi) >>> 1; - final int midValCmp = comparator.compare(array[mid], value); - - if (midValCmp < 0) { - lo = mid + 1; - } else if (midValCmp > 0) { - hi = mid - 1; - } else { - return mid; // value found - } - } - return ~lo; // value not present - } -} diff --git a/app/src/main/java/com/hippo/yorozuya/collect/SparseIJArray.java b/app/src/main/java/com/hippo/yorozuya/collect/SparseIJArray.java deleted file mode 100644 index 0451131c3..000000000 --- a/app/src/main/java/com/hippo/yorozuya/collect/SparseIJArray.java +++ /dev/null @@ -1,254 +0,0 @@ -/* - * Copyright 2016 Hippo Seven - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.hippo.yorozuya.collect; - -/** - * SparseIJArrays map integers to longs. Unlike a normal array of longs, - * there can be gaps in the indices. It is intended to be more memory efficient - * than using a HashMap to map Integers to Longs, both because it avoids - * auto-boxing keys and values and its data structure doesn't rely on an extra entry object - * for each mapping. - * - *

Note that this container keeps its mappings in an array data structure, - * using a binary search to find keys. The implementation is not intended to be appropriate for - * data structures - * that may contain large numbers of items. It is generally slower than a traditional - * HashMap, since lookups require a binary search and adds and removes require inserting - * and deleting entries in the array. For containers holding up to hundreds of items, - * the performance difference is not significant, less than 50%.

- * - *

It is possible to iterate over the items in this container using - * {@link #keyAt(int)} and {@link #valueAt(int)}. Iterating over the keys using - * keyAt(int) with ascending values of the index will return the - * keys in ascending order, or the values corresponding to the keys in ascending - * order in the case of valueAt(int).

- */ -public class SparseIJArray { - private int[] mKeys; - private long[] mValues; - private int mSize; - - /** - * Creates a new SparseIJArray containing no mappings. - */ - public SparseIJArray() { - this(10); - } - - /** - * Creates a new SparseIJArray containing no mappings that will not - * require any additional memory allocation to store the specified - * number of mappings. If you supply an initial capacity of 0, the - * sparse array will be initialized with a light-weight representation - * not requiring any additional array allocations. - */ - public SparseIJArray(int initialCapacity) { - if (initialCapacity == 0) { - mKeys = CollectionUtils.EMPTY_INT_ARRAY; - mValues = CollectionUtils.EMPTY_LONG_ARRAY; - } else { - mKeys = new int[initialCapacity]; - mValues = new long[initialCapacity]; - } - mSize = 0; - } - - @Override - public SparseIJArray clone() { - SparseIJArray clone = null; - try { - clone = (SparseIJArray) super.clone(); - clone.mKeys = mKeys.clone(); - clone.mValues = mValues.clone(); - } catch (CloneNotSupportedException e) { - /* ignore */ - } - return clone; - } - - /** - * Gets the long mapped from the specified key, or 0 - * if no such mapping has been made. - */ - public long get(int key) { - return get(key, 0); - } - - /** - * Gets the long mapped from the specified key, or the specified value - * if no such mapping has been made. - */ - public long get(int key, long valueIfKeyNotFound) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i < 0) { - return valueIfKeyNotFound; - } else { - return mValues[i]; - } - } - - /** - * Removes the mapping from the specified key, if there was any. - */ - public void delete(int key) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - removeAt(i); - } - } - - /** - * Removes the mapping at the given index. - */ - public void removeAt(int index) { - System.arraycopy(mKeys, index + 1, mKeys, index, mSize - (index + 1)); - System.arraycopy(mValues, index + 1, mValues, index, mSize - (index + 1)); - mSize--; - } - - /** - * Adds a mapping from the specified key to the specified value, - * replacing the previous mapping from the specified key if there - * was one. - */ - public void put(int key, long value) { - int i = ContainerHelpers.binarySearch(mKeys, mSize, key); - - if (i >= 0) { - mValues[i] = value; - } else { - i = ~i; - - mKeys = CollectionUtils.insert(mKeys, mSize, i, key); - mValues = CollectionUtils.insert(mValues, mSize, i, value); - mSize++; - } - } - - /** - * Returns the number of key-value mappings that this SparseIntArray - * currently stores. - */ - public int size() { - return mSize; - } - - /** - * Given an index in the range 0...size()-1, returns - * the key from the indexth key-value mapping that this - * SparseIJArray stores. - * - *

The keys corresponding to indices in ascending order are guaranteed to - * be in ascending order, e.g., keyAt(0) will return the - * smallest key and keyAt(size()-1) will return the largest - * key.

- */ - public int keyAt(int index) { - return mKeys[index]; - } - - /** - * Given an index in the range 0...size()-1, returns - * the value from the indexth key-value mapping that this - * SparseIJArray stores. - * - *

The values corresponding to indices in ascending order are guaranteed - * to be associated with keys in ascending order, e.g., - * valueAt(0) will return the value associated with the - * smallest key and valueAt(size()-1) will return the value - * associated with the largest key.

- */ - public long valueAt(int index) { - return mValues[index]; - } - - /** - * Returns the index for which {@link #keyAt} would return the - * specified key, or a negative number if the specified - * key is not mapped. - */ - public int indexOfKey(int key) { - return ContainerHelpers.binarySearch(mKeys, mSize, key); - } - - /** - * Returns an index for which {@link #valueAt} would return the - * specified key, or a negative number if no keys map to the - * specified value. - * Beware that this is a linear search, unlike lookups by key, - * and that multiple keys can map to the same value and this will - * find only one of them. - */ - public int indexOfValue(long value) { - for (int i = 0; i < mSize; i++) - if (mValues[i] == value) - return i; - - return -1; - } - - /** - * Removes all key-value mappings from this SparseIntArray. - */ - public void clear() { - mSize = 0; - } - - /** - * Puts a key/value pair into the array, optimizing for the case where - * the key is greater than all existing keys in the array. - */ - public void append(int key, long value) { - if (mSize != 0 && key <= mKeys[mSize - 1]) { - put(key, value); - return; - } - - mKeys = CollectionUtils.append(mKeys, mSize, key); - mValues = CollectionUtils.append(mValues, mSize, value); - mSize++; - } - - /** - * {@inheritDoc} - * - *

This implementation composes a string by iterating over its mappings. - */ - @Override - public String toString() { - if (size() <= 0) { - return "{}"; - } - - StringBuilder buffer = new StringBuilder(mSize * 28); - buffer.append('{'); - for (int i = 0; i < mSize; i++) { - if (i > 0) { - buffer.append(", "); - } - int key = keyAt(i); - buffer.append(key); - buffer.append('='); - long value = valueAt(i); - buffer.append(value); - } - buffer.append('}'); - return buffer.toString(); - } -}