🍓 Sync 2023-10-29 20:25:26

luci-app-homeproxy/root/etc/homeproxy/scripts/update_subscriptions.uc

@@ -246,7 +246,7 @@ function parse_uri(uri) {
 			if (!uri)
 				return null;
 
-			const userinfo = split(uri[0], ':'),
+			const userinfo = split(uri[0], ':');
 			params = urldecode_params(uri[1]);
 
 			if (!sing_features.with_shadowsocksr) {

luci-app-wrtbwmon/htdocs/luci-static/resources/view/wrtbwmon/details.js

@@ -135,10 +135,6 @@ function displayTable(tb, settings) {
 	progressbar('upstream', cachedData[1][1], settings.upstream, settings.useBits, settings.useMultiple);
 }
 
-function formatBandWidth(bdw, useBits) {
-	return bdw * Math.pow(1000, 2) / (useBits ? 1 : 8);
-}
-
 function formatSize(size, useBits, useMultiple) {
 	var res = String.format('%%%s.2m%s'.format(useMultiple, (useBits ? 'bit' : 'B')), useBits ? size * 8 : size);
 	return useMultiple == '1024' ? res.replace(/([KMGTPEZ])/, '$&i') : res;
@@ -277,9 +273,10 @@ function parseDefaultSettings(file) {
 }
 
 function progressbar(query, v, m, useBits, useMultiple) {
+	// v = B/s, m = Mb/s
 	var pg = $(query),
-	    vn = v || 0,
-	    mn = formatBandWidth(m, useBits) || 100,
+	    vn = (v * 8) || 0,
+	    mn = (m || 100) * Math.pow(1000, 2),
 	    fv = formatSpeed(v, useBits, useMultiple),
 	    pc = '%.2f'.format((100 / mn) * vn),
 	    wt = Math.floor(pc > 100 ? 100 : pc),

modeminfo/Makefile

@@ -2,7 +2,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=modeminfo
 PKG_VERSION:=0.3.9
-PKG_RELEASE:=38
+PKG_RELEASE:=39
 PKG_MAINTAINER:=Konstantine Shevlakov <shevlakov@132lan.ru>
 
 include $(INCLUDE_DIR)/package.mk

modeminfo/root/usr/share/modeminfo/scripts/A7XXX

@@ -1,16 +1,16 @@
 function modem_data(){
 	generic_data
 	DATA=$(echo "$O" | grep -Ev '^$|^OK|^AT' | sort)
-	MANUF=$(echo "$DATA" | awk 'c&&! --c;/ZRSSI/{c=3}')
-	MODEL=$(echo "$DATA" | awk 'c&&! --c;/ZRSSI/{c=4}')
+	MANUF=$(echo "$DATA" | awk 'c&&! --c;/ZRSSI/{c=4}')
+	MODEL=$(echo "$DATA" | awk 'c&&! --c;/ZRSSI/{c=3}')
 	FW=$(echo "$DATA" | awk '/CGMR/{print $2}')
-	DEVICE="$MANUF $MODEL"
+	DEVICE="$MODEL"
 	TECH=$(echo "$DATA" | awk -F [,] '/\+COPS/{print $NF}')
 	ICCID=$(echo "$DATA" | awk '/ICCID:/{print $2}')
 	IMSI=$(echo "$DATA" | awk 'c&&! --c;/ZRSSI/{c=1}')
 	IMEI=$(echo "$DATA" | awk 'c&&! --c;/ZRSSI/{c=2}')
 	REGST=$(echo "$DATA" | awk -F[,] '/\'$CREG'/ {print $2}')
-	CHIPTEMP=$(echo "$DATA" | awk -F [,] '/\*RFTEMP/{printf "%.0f\n", ($2/10)}')
+	CHIPTEMP=$(echo "$DATA" | awk '/\+CPMUTEMP/{printf "%.0f\n", ($2/1000)}')
 	EARFCN=$(echo "$DATA" | awk -F[,\ ] '/^\+CPSI/ {print $9}')
 
 	case $TECH in

modeminfo/root/usr/share/modeminfo/scripts/A7XXX.at

@@ -6,5 +6,5 @@ AT+CEREG=2; +CEREG?; +CSQ
 AT+CPSI?
 AT+ZRSSI
 AT+CGMI; +CGMM; +CGMR; +CIMI; +CGSN; +CICCID
-AT*RFTEMP=1
+AT+CPMUTEMP
 AT+ZCAINFO?

subconverter/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=subconverter
-PKG_RELEASE:=49
+PKG_RELEASE:=50
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/tindy2013/subconverter.git
-PKG_SOURCE_DATE:=2023-10-09
-PKG_SOURCE_VERSION:=e847df357bd9b4a2bb1b9188029d6f43a6da1041
+PKG_SOURCE_DATE:=2023-10-16
+PKG_SOURCE_VERSION:=80c2a968d1891d9234e2ce13918ca248fc873355
 PKG_MIRROR_HASH:=skip
-PKG_VERSION:=0.8.0-$(call version_abbrev,$(PKG_SOURCE_VERSION))
+PKG_VERSION:=0.8.1-$(call version_abbrev,$(PKG_SOURCE_VERSION))
 
 PKG_LICENSE:=GPL-3.0
 PKG_LICENSE_FILES:=LICENSE

ua2f/Makefile

@@ -6,8 +6,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=UA2F
-PKG_VERSION:=4.3.3
-PKG_RELEASE:=4
+PKG_VERSION:=4.4.0
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://codeload.github.com/Zxilly/UA2F/tar.gz/v$(PKG_VERSION)?
@@ -30,7 +30,7 @@ define Package/ua2f
   SUBMENU:=Routing and Redirection
   TITLE:=Change User-Agent to Fwords
   URL:=https://github.com/Zxilly/UA2F
-  DEPENDS:=+libnetfilter-conntrack +libnetfilter-queue +kmod-nft-queue \
+  DEPENDS:=+libuci +libnetfilter-conntrack +libnetfilter-queue +kmod-nft-queue \
     +USE_GLIBC:libasan
 endef