容器版本更新；使用 Prowlarr 替换 Jackett

README.md

@@ -28,7 +28,7 @@
 
 ```mermaid
 graph LR
-    1[Jellyseerr] == 手动请求电视剧/综艺/动漫 ==> 2[Sonarr] == 自动搜索/下载 ==> 3[JProxy] == 自动搜索 ==> 4[Jackett]
+    1[Jellyseerr] == 手动请求电视剧/综艺/动漫 ==> 2[Sonarr] == 自动搜索/下载 ==> 3[JProxy] == 自动搜索 ==> 4[Prowlarr]
     1[Jellyseerr] == 手动请求电影 ==> 6[Radarr] == 自动搜索/下载 ==> 3[JProxy]
     3[JProxy] == 自动下载 ==> 5[qBittorrentee]
     2[Sonarr] == 自动导入 ==> 7[Emby]
@@ -48,9 +48,9 @@ graph LR
 | [Jellyseerr](https://github.com/Fallenbagel/jellyseerr) | 聚合搜索 | ⭕ | 搜索并推送到 Sonarr / Radarr |
 | [Radarr](https://github.com/Radarr/Radarr) | 电影订阅系统 | ⭕ | 定时搜索，下载，重命名并导入 |
 | [Sonarr](https://github.com/Sonarr/Sonarr) | 电视剧和动漫订阅系统 | ❌ | 定时搜索，下载，重命名并导入 |
-| [Jackett](https://github.com/Jackett/Jackett) | 种子站代理 | ❌ | 可添加种子站，提供种子搜索，支持结果缓存 |
-| [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) | 绕过 Cloudflare 和 DDoS-GUARD | - | Jackett 已配置，无其他操作 |
-| [JProxy](https://github.com/LuckyPuppy514/jproxy) | 种子站代理过滤 | ⭕ | 介于 Sonarr / Radarr 和 Jackett / Prowlarr 之间的代理，主要用于优化查询和提升识别率 |
+| [Prowlarr](https://github.com/Prowlarr/Prowlarr) | 种子站代理 | ❌ | 可添加种子站，提供种子搜索，支持结果缓存 |
+| [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr) | 绕过 Cloudflare 和 DDoS-GUARD | - | Prowlarr 已配置，无其他操作 |
+| [JProxy](https://github.com/LuckyPuppy514/jproxy) | 种子站代理过滤 | ⭕ | 介于 Sonarr / Radarr 和 Prowlarr / Prowlarr 之间的代理，主要用于优化查询和提升识别率 |
 | [qBittorrent](https://github.com/qbittorrent/qBittorrent) | 下载客户端 | ⭕ | qBittorrent |
 | [ChineseSubFinder](https://github.com/ChineseSubFinder/ChineseSubFinder) | 字幕下载 | ⭕ | 自动下载电影和电视剧字幕 |
 
@@ -72,8 +72,8 @@ Radarr
 Sonarr
 ![Sonarr_tuya](https://cdn.jsdelivr.net/gh/LuckyPuppy514/pic-bed/common/Sonarr_tuya.jpg)
 
-Jackett
-![Jackett_tuya](https://cdn.jsdelivr.net/gh/LuckyPuppy514/pic-bed/common/Jackett_tuya.jpg)
+Prowlarr
+![Prowlarr_tuya](https://cdn.jsdelivr.net/gh/LuckyPuppy514/pic-bed/common/Prowlarr_tuya.jpg)
 
 JProxy
 ![20230414184607](https://github.com/LuckyPuppy514/image/raw/main/2023/2023-04-14/20230414184607.webp)
@@ -250,11 +250,11 @@ graph LR
 | Heimdall | `https://ip:60211`  | - | - |
 | Portainer | `http://ip:60212` | atm | atm@20230101 |
 | FlareSolverr | `http://ip:60213` | - | - |
-| Jackett | `http://ip:60214` | - | - |
+| Prowlarr | `http://ip:60223` | atm | atm@20230101 |
 | JProxy | `http://ip:60215` | atm | atm@20230101 |
 | Jellyseerr | `http://ip:60216` | atm | atm@20230101 |
-| Radarr | `http://ip:60217` | - | - |
-| Sonarr | `http://ip:60218` | - | - |
+| Radarr | `http://ip:60217` | atm | atm@20230101 |
+| Sonarr | `http://ip:60218` | atm | atm@20230101 |
 | qBittorrent | `http://ip:60219` | atm | atm@20230101 |
 | ChineseSubFinder | `http://ip:60221` | atm | atm@20230101 |
 | Emby | `http://ip:60220` | atm | atm@20230101 |

config/chinesesubfinder/ChineseSubFinderSettings.json

@@ -1 +1 @@
-{"SpeedDevMode":false,"user_info":{"username":"atm","password":"atm@20230101"},"common_settings":{"interval_or_assign_or_custom":0,"scan_interval":"@every 6h","threads":1,"run_scan_at_start_up":false,"movie_paths":["/media/video/movie"],"series_paths":["/media/video/serial"],"local_static_file_port":"19037"},"subtitle_sources":{"assrt_settings":{"enabled":false,"token":""},"subtitle_best_settings":{"enabled":false,"api_key":""}},"advanced_settings":{"proxy_settings":{"use_proxy":false,"use_which_proxy_protocol":"http","local_http_proxy_server_port":"19036","input_proxy_address":"127.0.0.1","input_proxy_port":"10809","need_pwd":false,"input_proxy_username":"","input_proxy_password":""},"tmdb_api_settings":{"enable":false,"api_key":""},"debug_mode":false,"save_full_season_tmp_subtitles":false,"sub_type_priority":0,"sub_name_formatter":0,"save_multi_sub":false,"custom_video_exts":[],"fix_time_line":false,"topic":1,"suppliers_settings":{"xunlei":{"name":"xunlei","root_url":"http://sub.xmp.sandai.net:8000/subxl/%s.json","search_url":"","daily_download_limit":-1},"shooter":{"name":"shooter","root_url":"https://www.shooter.cn/api/subapi.php","search_url":"","daily_download_limit":-1},"assrt":{"name":"assrt","root_url":"https://api.assrt.net/v1","search_url":"","daily_download_limit":-1},"a4k":{"name":"a4k","root_url":"https://www.a4k.net","search_url":"/search?term=","daily_download_limit":-1},"subhd":{"name":"subhd","root_url":"https://subhd.tv","search_url":"/search/%s","daily_download_limit":20},"zimuku":{"name":"zimuku","root_url":"https://zimuku.org","search_url":"/search?q=%s","daily_download_limit":20},"subtitle_best":{"name":"subtitle_best","root_url":"https://api.subtitle.best/share-sub/v1","search_url":"/search-movie","daily_download_limit":-1}},"scan_logic":{"skip_chinese_movie":true,"skip_chinese_series":true},"task_queue":{"max_retry_times":3,"one_job_time_out":300,"interval":10,"expiration_time":90,"download_sub_during_x_days":7,"one_sub_download_interval":12,"check_pulic_ip_target_site":""},"download_file_cache":{"ttl":4320,"unit":"hour"}},"emby_settings":{"enable":true,"address_url":"http://172.128.2.20:8096","api_key":"1ae1f02413e5452085150e66b03cfb4f","max_request_video_number":3000,"skip_watched":true,"movie_paths_mapping":{"/media/video/movie":""},"series_paths_mapping":{"/media/video/serial":""},"auto_or_manual":true,"threads":4},"developer_settings":{"enable":false,"bark_server_address":""},"timeline_fixer_settings":{"max_offset_time":700,"min_offset":0.2},"experimental_function":{"auto_change_sub_encode":{"enable":false,"des_encode_type":0},"chs_cht_changer":{"enable":false,"des_chinese_language_type":0},"remote_chrome_settings":{"enable":false,"remote_docker_url":"","remote_adblock_path":"","remote_user_data_dir":""},"api_key_settings":{"enabled":false,"key":""},"local_chrome_settings":{"enabled":false,"local_chrome_exe_f_path":""},"share_sub_settings":{"share_sub_enabled":false},"extend_log":{"SysLog":{"enable":false,"network":"","address":"","priority":0,"tag":""}}}}
+{"SpeedDevMode":false,"user_info":{"username":"atm","password":"atm@20230101"},"common_settings":{"interval_or_assign_or_custom":0,"scan_interval":"@every 6h","threads":1,"run_scan_at_start_up":false,"movie_paths":["/media/video/movie"],"series_paths":["/media/video/serial"],"local_static_file_port":"19037"},"subtitle_sources":{"assrt_settings":{"enabled":false,"token":""},"subtitle_best_settings":{"enabled":false,"api_key":""}},"advanced_settings":{"proxy_settings":{"use_proxy":false,"use_which_proxy_protocol":"http","local_http_proxy_server_port":"19036","input_proxy_address":"127.0.0.1","input_proxy_port":"10809","need_pwd":false,"input_proxy_username":"","input_proxy_password":""},"tmdb_api_settings":{"enable":false,"api_key":"","use_alternate_base_url":false},"debug_mode":false,"save_full_season_tmp_subtitles":false,"sub_type_priority":0,"sub_name_formatter":0,"save_multi_sub":false,"custom_video_exts":[],"fix_time_line":false,"topic":1,"suppliers_settings":{"xunlei":{"name":"xunlei","root_url":"http://sub.xmp.sandai.net:8000/subxl/%s.json","search_url":"","daily_download_limit":-1},"shooter":{"name":"shooter","root_url":"https://www.shooter.cn/api/subapi.php","search_url":"","daily_download_limit":-1},"assrt":{"name":"assrt","root_url":"https://api.assrt.net/v1","search_url":"","daily_download_limit":-1},"a4k":{"name":"a4k","root_url":"https://www.a4k.net","search_url":"/search?keyword=","daily_download_limit":-1},"subhd":{"name":"subhd","root_url":"https://subhd.tv","search_url":"/search/%s","daily_download_limit":20},"zimuku":{"name":"zimuku","root_url":"https://zimuku.org","search_url":"/search?q=%s","daily_download_limit":20},"subtitle_best":{"name":"subtitle_best","root_url":"https://api.subtitle.best/share-sub/v1","search_url":"/search-movie","daily_download_limit":-1}},"scan_logic":{"skip_chinese_movie":true,"skip_chinese_series":true},"task_queue":{"max_retry_times":3,"one_job_time_out":300,"interval":10,"expiration_time":90,"download_sub_during_x_days":7,"one_sub_download_interval":12,"check_pulic_ip_target_site":""},"download_file_cache":{"ttl":4320,"unit":"hour"}},"emby_settings":{"enable":true,"address_url":"http://172.128.2.20:8096","api_key":"1ae1f02413e5452085150e66b03cfb4f","max_request_video_number":3000,"skip_watched":true,"movie_paths_mapping":{"/media/video/movie":""},"series_paths_mapping":{"/media/video/serial":""},"auto_or_manual":true,"threads":4},"developer_settings":{"enable":false,"bark_server_address":""},"timeline_fixer_settings":{"max_offset_time":700,"min_offset":0.2,"thread_count":5},"experimental_function":{"auto_change_sub_encode":{"enable":false,"des_encode_type":0},"chs_cht_changer":{"enable":false,"des_chinese_language_type":0},"remote_chrome_settings":{"enable":false,"remote_docker_url":"","remote_adblock_path":"","remote_user_data_dir":""},"api_key_settings":{"enabled":false,"key":""},"local_chrome_settings":{"enabled":false,"local_chrome_exe_f_path":""},"share_sub_settings":{"share_sub_enabled":false},"extend_log":{"SysLog":{"enable":false,"network":"","address":"","priority":0,"tag":""}}}}

config/emby/config/system.xml

@@ -31,12 +31,10 @@
   <EnableDashboardResponseCaching>true</EnableDashboardResponseCaching>
   <ImageSavingConvention>Compatible</ImageSavingConvention>
   <EnableAutomaticRestart>true</EnableAutomaticRestart>
-  <CollectionFolderIdsMigrated>true</CollectionFolderIdsMigrated>
   <ServerName>ATM</ServerName>
+  <PreferredDetectedRemoteAddressFamily>InterNetwork</PreferredDetectedRemoteAddressFamily>
   <UICulture>zh-CN</UICulture>
-  <SaveMetadataHidden>false</SaveMetadataHidden>
   <RemoteClientBitrateLimit>0</RemoteClientBitrateLimit>
-  <DisplaySpecialsWithinSeasons>true</DisplaySpecialsWithinSeasons>
   <LocalNetworkSubnets />
   <LocalNetworkAddresses />
   <EnableExternalContentInSuggestions>true</EnableExternalContentInSuggestions>
@@ -49,17 +47,19 @@
   <UninstalledPlugins />
   <CollapseVideoFolders>true</CollapseVideoFolders>
   <EnableOriginalTrackTitles>false</EnableOriginalTrackTitles>
-  <VacuumDatabaseOnStartup>false</VacuumDatabaseOnStartup>
+  <VacuumDatabaseOnStartup>true</VacuumDatabaseOnStartup>
   <SimultaneousStreamLimit>0</SimultaneousStreamLimit>
   <DatabaseCacheSizeMB>128</DatabaseCacheSizeMB>
   <EnableSqLiteMmio>false</EnableSqLiteMmio>
-  <NextUpUpgraded>true</NextUpUpgraded>
-  <ChannelOptionsUpgraded>true</ChannelOptionsUpgraded>
-  <TimerIdsUpgraded>true</TimerIdsUpgraded>
-  <ForcedSortNameUpgraded>true</ForcedSortNameUpgraded>
-  <InheritedParentalRatingValueUpgraded>true</InheritedParentalRatingValueUpgraded>
+  <PlaylistsUpgradedToM3U>true</PlaylistsUpgradedToM3U>
+  <ImageExtractorUpgraded>true</ImageExtractorUpgraded>
   <EnablePeopleLetterSubFolders>true</EnablePeopleLetterSubFolders>
   <OptimizeDatabaseOnShutdown>true</OptimizeDatabaseOnShutdown>
   <DatabaseAnalysisLimit>400</DatabaseAnalysisLimit>
   <DisableAsyncIO>false</DisableAsyncIO>
+  <MigratedToUserItemShares4>true</MigratedToUserItemShares4>
+  <MigratedLibraryOptionsToDb>true</MigratedLibraryOptionsToDb>
+  <AllowLegacyLocalNetworkPassword>true</AllowLegacyLocalNetworkPassword>
+  <EnableSavedMetadataForPeople>false</EnableSavedMetadataForPeople>
+  <ProxyHeaderMode>RemoteAddressesOnly</ProxyHeaderMode>
 </ServerConfiguration>

config/emby/data/lastversion.txt

@@ -1 +1 @@
-4.7.11.0
+4.8.0.69

config/emby/data/wan.dat

@@ -1 +1 @@
-MTAzLjE0OS4yNDkuMjI4
+MTAzLjg0LjIxNy40MQ==

config/heimdall/nginx/nginx.conf.sample

@@ -1,4 +1,4 @@
-## Version 2022/08/16 - Changelog: https://github.com/linuxserver/docker-baseimage-alpine-nginx/commits/master/root/defaults/nginx/nginx.conf.sample
+## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-baseimage-alpine-nginx/commits/master/root/defaults/nginx/nginx.conf.sample
 
 ### Based on alpine defaults
 # https://git.alpinelinux.org/aports/tree/main/nginx/nginx.conf?h=3.15-stable
@@ -55,7 +55,7 @@ http {
     tcp_nopush on;
 
     # all ssl related config moved to ssl.conf
-    include /config/nginx/ssl.conf;
+    # included in server blocks where listen 443 is defined
 
     # Enable gzipping of responses.
     #gzip on;

config/heimdall/nginx/site-confs/default.conf.sample

@@ -1,4 +1,4 @@
-## Version 2022/11/14 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
+## Version 2023/04/13 - Changelog: https://github.com/linuxserver/docker-heimdall/commits/master/root/defaults/nginx/site-confs/default.conf.sample
 
 server {
     listen 80 default_server;
@@ -9,6 +9,8 @@ server {
 
     server_name _;
 
+    include /config/nginx/ssl.conf;
+
     root /app/www/public;
     index index.html index.htm index.php;