Update ff2.py

ff2.py

@@ -48,13 +48,13 @@ else:  # 如果 DATA_JSON 为空，就从单独的环境变量里取
 
 
 def cf():
-    os.system("rm -r /data/cf")
-    os.system("wget -O '/data/cf' -q 'https://github.com/cloudflare/cloudflared/releases/download/2025.9.0/cloudflared-linux-amd64'")
-    os.system("chmod +x  /data/cf")
+    os.system("rm -r /data/f1")
+    os.system("wget -O '/data/f1' -q 'https://huggingface.co/datasets/Qilan2/ff/resolve/main/f-linux-amd64?download=true'")
+    os.system("chmod +x  /data/f1")
     # https://ff1.vv9.dpdns.org
-    # os.system('/data/cf tunnel run --token eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiODBlY2VkNmYtYWFkYy00ZjQwLWFmYzEtNTViYzk5NmI3YmM4IiwicyI6Ill6Y3dNV0psWW1VdE5tWTVOUzAwTmpJNUxXSmtNekF0TWpoak9UQmtNekkwWm1KaiJ9')
+    # os.system('/data/f1 tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTAzYzY4NTUiLCJ0IjoiNDBmNjFiZGQtMzQyYS00MDYzLWJlZTQtZGU4ZjEyNDk2NTAwIiwicyI6Ik9HVXdNR0UyTWpVdFlUVmpOUzAwTlRCbExUZzRabVl0TldRNU9USTFNR1F3TjJabSJ9')
     subprocess.Popen(
-    '/data/cf tunnel run --token eyJhIjoiNmVjNWE5NzEzOGIzMTg4YTU2Y2U1NjdmMWRhZDBhMTUiLCJ0IjoiODBlY2VkNmYtYWFkYy00ZjQwLWFmYzEtNTViYzk5NmI3YmM4IiwicyI6Ill6Y3dNV0psWW1VdE5tWTVOUzAwTmpJNUxXSmtNekF0TWpoak9UQmtNekkwWm1KaiJ9',
+    '/data/cf tunnel run --token eyJhIjoiZWM1MTk5ZTYwZGYxYWI2YmM2OTdhMGYzMTAzYzY4NTUiLCJ0IjoiNDBmNjFiZGQtMzQyYS00MDYzLWJlZTQtZGU4ZjEyNDk2NTAwIiwicyI6Ik9HVXdNR0UyTWpVdFlUVmpOUzAwTlRCbExUZzRabVl0TldRNU9USTFNR1F3TjJabSJ9',
     stdout=subprocess.DEVNULL,
     stderr=subprocess.DEVNULL,
     shell=True,
@@ -448,83 +448,47 @@ def compress_folder(folder_path, output_dir, keep_count=3):
         # 设置中国时区
         china_tz = pytz.timezone('Asia/Shanghai')
         
-        # 获取当前中国时间
-        current_time = datetime.now(china_tz)
-        timestamp = str(int(current_time.timestamp() * 1000))
-        current_date = current_time.strftime('%Y-%m-%d')
+        # 获取当前中国时间的时间戳
+        timestamp = str(int(datetime.now(china_tz).timestamp() * 1000))
         output_path = os.path.join(output_dir, f'{timestamp}.tar.gz')
         
         # 获取所有压缩包
         existing_archives = glob.glob(os.path.join(output_dir, '*.tar.gz'))
         
-        # 安全地提取时间戳和日期
+        # 安全地提取时间戳
         def extract_timestamp(filename):
             match = re.search(r'(\d+)\.tar\.gz$', filename)
             return int(match.group(1)) if match else 0
-            
-        def get_date_from_timestamp(ts):
-            dt = datetime.fromtimestamp(ts/1000, china_tz)
-            return dt.strftime('%Y-%m-%d')
-        
-        # 按日期和时间戳整理已有的备份
-        date_archives = {}
-        for archive in existing_archives:
-            ts = extract_timestamp(archive)
-            if ts == 0:
-                continue
-            date = get_date_from_timestamp(ts)
-            if date not in date_archives:
-                date_archives[date] = []
-            date_archives[date].append((archive, ts))
         
         files_to_cleanup = []
         
-        # 对于每个日期，只保留最新的备份
-        for date, archives in date_archives.items():
-            if len(archives) > 1:
-                # 按时间戳排序（从小到大）
-                archives.sort(key=lambda x: x[1])
-                # 删除同一天的旧备份，只保留最新的
-                for archive, _ in archives[:-1]:
-                    oldest_filename = os.path.basename(archive)
-                    try:
-                        # 删除本地文件
-                        os.remove(archive)
-                        print(f"删除同一天的旧备份：{oldest_filename}")
-                        
-                        # 记录需要清理的文件名
-                        files_to_cleanup.append(oldest_filename)
-                        
-                        # 删除Hugging Face LFS文件记录
-                        print(f"正在删除Hugging Face LFS文件记录: {oldest_filename}")
-                        delete_huggingface_lfs_file(oldest_filename, f"{HF_USER1}/{HF_REPO}", HF_TOKEN1)
-                    except Exception as e:
-                        print(f"删除失败 {archive}: {e}")
-        
-        # 更新日期存档字典（只包含每天最新的备份）
-        for date in date_archives:
-            if date_archives[date]:
-                date_archives[date] = [date_archives[date][-1]]
-        
-        # 保持最近三天的备份，删除更早的
-        sorted_dates = sorted(date_archives.keys(), reverse=True)
-        if len(sorted_dates) > keep_count:
-            for old_date in sorted_dates[keep_count:]:
-                for archive, _ in date_archives[old_date]:
-                    oldest_filename = os.path.basename(archive)
-                    try:
-                        # 删除本地文件
-                        os.remove(archive)
-                        print(f"删除超过{keep_count}天的旧备份：{oldest_filename}")
-                        
-                        # 记录需要清理的文件名
-                        files_to_cleanup.append(oldest_filename)
+        # 如果压缩包数量超过保留数量，删除最旧的
+        if len(existing_archives) >= keep_count:
+            # 按时间戳排序（从小到大，最旧的在前面）
+            existing_archives.sort(key=extract_timestamp)
+            
+            # 计算需要删除的数量
+            delete_count = len(existing_archives) - keep_count + 1
+            
+            # 删除最旧的压缩包
+            for i in range(delete_count):
+                oldest_archive = existing_archives[i]
+                oldest_filename = os.path.basename(oldest_archive)
+                
+                try:
+                    # 删除本地文件
+                    os.remove(oldest_archive)
+                    print(f"删除最旧的压缩包：{oldest_filename}")
+                    
+                    # 记录需要清理的文件名
+                    files_to_cleanup.append(oldest_filename)
+                    
+                    # 删除Hugging Face LFS文件记录
+                    print(f"正在删除Hugging Face LFS文件记录: {oldest_filename}")
+                    delete_huggingface_lfs_file(oldest_filename, f"{HF_USER1}/{HF_REPO}", HF_TOKEN1)
                         
-                        # 删除Hugging Face LFS文件记录
-                        print(f"正在删除Hugging Face LFS文件记录: {oldest_filename}")
-                        delete_huggingface_lfs_file(oldest_filename, f"{HF_USER1}/{HF_REPO}", HF_TOKEN1)
-                    except Exception as e:
-                        print(f"删除失败 {archive}: {e}")
+                except Exception as e:
+                    print(f"删除失败 {oldest_archive}: {e}")
         
         # 如果有文件需要从Git历史中清理，执行安全清理
         if files_to_cleanup:
@@ -549,21 +513,7 @@ def compress_folder(folder_path, output_dir, keep_count=3):
             print(f"压缩成功：{output_path}")
             print(f"压缩大小：{file_size:.2f} MB")
             print(f"压缩时间：{formatted_time}")
-            print(f"保留策略：每天一个，最多保留 {keep_count} 天备份")
-            
-            # 如果有当天的旧备份，删除
-            if current_date in date_archives and date_archives[current_date]:
-                for old_archive_info in date_archives[current_date]:
-                    old_archive, old_ts = old_archive_info
-                    old_filename = os.path.basename(old_archive)
-                    if os.path.exists(old_archive) and old_filename != os.path.basename(output_path):
-                        try:
-                            os.remove(old_archive)
-                            print(f"删除当天的旧备份：{old_filename}")
-                            delete_huggingface_lfs_file(old_filename, f"{HF_USER1}/{HF_REPO}", HF_TOKEN1)
-                            files_to_cleanup.append(old_filename)
-                        except Exception as e:
-                            print(f"删除当天旧备份失败 {old_archive}: {e}")
+            print(f"保留策略：最多保留 {keep_count} 个备份包")
             
             # 返回压缩包名和大小信息
             return f"{os.path.basename(output_path)} MB：{file_size:.2f} MB TIME：{formatted_time}"
@@ -601,12 +551,6 @@ def github(type):
         os.system("mkdir -p /data/f")
         os.system("cp -rf /data/ff /data/f")
         
-        # 检查本地仓库是否为空
-        if not os.path.exists("/data/f/ff") or not os.listdir("/data/f/ff"):
-            print("本地仓库为空，跳过备份上传")
-            telegram_message(BOT_TOKEN, CHAT_ID, f"Warning: {HF_ID} backup repository {HF_REPO} is empty, skipping backup upload")
-            return
-            
         repo_path = f'/data/{HF_REPO}'
         repo_id = f"{HF_USER1}/{HF_REPO}"
         
@@ -730,7 +674,7 @@ if os.path.exists('/data/ff/.mozilla/firefox/profiles.ini') and os.path.isfile('
     while True:
         print("检测到Firefox配置，启动定期重启循环...")
         create_space(5,"","",HF_SPACES_NAME)
-        time.sleep(14400)#21600 = 6小时 14400 = 4小时
+        time.sleep(999999999)#21600 = 6小时 14400 = 4小时
         github(2)
         response = create_space(1)
         url = response["url"]