Merge pull request #745 from Guovin/dev

Fix

Dockerfile

@@ -40,7 +40,7 @@ RUN echo "deb https://mirrors.aliyun.com/debian/ bookworm main contrib non-free
   deb-src https://mirrors.aliyun.com/debian-security/ bookworm-security main contrib non-free non-free-firmware\n" \
   > /etc/apt/sources.list
 
-RUN apt-get update && apt-get install -y --no-install-recommends cron
+RUN apt-get update && apt-get install -y --no-install-recommends cron ffmpeg
 
 RUN if [ "$LITE" = False ]; then apt-get install -y --no-install-recommends chromium chromium-driver; fi \
   && apt-get clean && rm -rf /var/lib/apt/lists/*

utils/channel.py

@@ -603,7 +603,7 @@ async def limited_get_speed(info, ipv6_proxy, filter_resolution, timeout, callba
     open_filter_speed = config.open_filter_speed
     open_filter_resolution = config.open_filter_resolution
     min_speed = config.min_speed
-    min_resolution = config.min_resolution
+    min_resolution = config.min_resolution_value
     for cate, obj in data.items():
         for name, info_list in obj.items():
             info_list = sort_urls(name, info_list, supply=open_supply, filter_speed=open_filter_speed,

utils/speed.py

@@ -299,7 +299,7 @@ async def get_speed(url, ipv6_proxy=None, filter_resolution=config.open_filter_r
 
 
 def sort_urls(name, data, supply=config.open_supply, filter_speed=config.open_filter_speed, min_speed=config.min_speed,
-              filter_resolution=config.open_filter_resolution, min_resolution=config.min_resolution,
+              filter_resolution=config.open_filter_resolution, min_resolution=config.min_resolution_value,
               logger=None):
     """
     Sort the urls with info