Merge pull request #1766 from fufesou/ci_with_privacy_mode2
ci windows add feature PrivacyMode
This commit is contained in:
		
						commit
						e4f367b596
					
				
							
								
								
									
										32
									
								
								build.py
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								build.py
									
									
									
									
									
								
							| @ -25,23 +25,23 @@ def get_version(): | |||||||
| def parse_rc_features(feature): | def parse_rc_features(feature): | ||||||
|     available_features = { |     available_features = { | ||||||
|         'IddDriver': { |         'IddDriver': { | ||||||
|             'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.1/RustDeskIddDriver_x64.zip', |             'zip_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.1/RustDeskIddDriver_x64_pic_en.zip', | ||||||
|             'checksum_url': 'https://github.com/fufesou/RustDeskIddDriver/releases/download/v0.1' |             'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1/checksum_md5', | ||||||
|                             '/RustDeskIddDriver_x64.zip.checksum_md5', |  | ||||||
|         }, |         }, | ||||||
|         'PrivacyMode': { |         'PrivacyMode': { | ||||||
|             'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1' |             'zip_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1' | ||||||
|                        '/TempTopMostWindow_x64.zip', |                        '/TempTopMostWindow_x64_pic_en.zip', | ||||||
|             'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1' |             'checksum_url': 'https://github.com/fufesou/RustDeskTempTopMostWindow/releases/download/v0.1/checksum_md5', | ||||||
|                             '/TempTopMostWindow_x64.zip.checksum_md5', |  | ||||||
|         } |         } | ||||||
|     } |     } | ||||||
|     apply_features = {} |     apply_features = {} | ||||||
|     if not feature: |     if not feature: | ||||||
|         return apply_features |         feature = [] | ||||||
|     elif isinstance(feature, str) and feature.upper() == 'ALL': |     if isinstance(feature, str) and feature.upper() == 'ALL': | ||||||
|         return available_features |         return available_features | ||||||
|     elif isinstance(feature, list): |     elif isinstance(feature, list): | ||||||
|  |         # force add PrivacyMode | ||||||
|  |         feature.append('PrivacyMode') | ||||||
|         for feat in feature: |         for feat in feature: | ||||||
|             if isinstance(feat, str) and feat.upper() == 'ALL': |             if isinstance(feat, str) and feat.upper() == 'ALL': | ||||||
|                 return available_features |                 return available_features | ||||||
| @ -82,11 +82,23 @@ def make_parser(): | |||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| def download_extract_features(features, res_dir): | def download_extract_features(features, res_dir): | ||||||
|  |     proxy = '' | ||||||
|  |     def req(url): | ||||||
|  |         if not proxy: | ||||||
|  |             return url | ||||||
|  |         else: | ||||||
|  |             r = urllib.request.Request(url) | ||||||
|  |             r.set_proxy(proxy, 'http') | ||||||
|  |             r.set_proxy(proxy, 'https') | ||||||
|  |             return r | ||||||
|  | 
 | ||||||
|     for (feat, feat_info) in features.items(): |     for (feat, feat_info) in features.items(): | ||||||
|         print(f'{feat} download begin') |         print(f'{feat} download begin') | ||||||
|         checksum_md5_response = urllib.request.urlopen(feat_info['checksum_url']) |  | ||||||
|         checksum_md5 = checksum_md5_response.read().decode('utf-8').split()[0] |  | ||||||
|         download_filename = feat_info['zip_url'].split('/')[-1] |         download_filename = feat_info['zip_url'].split('/')[-1] | ||||||
|  |         checksum_md5_response = urllib.request.urlopen(req(feat_info['checksum_url'])) | ||||||
|  |         for line in checksum_md5_response.read().decode('utf-8').splitlines(): | ||||||
|  |             if line.split()[1] == download_filename: | ||||||
|  |                 checksum_md5 = line.split()[0] | ||||||
|                 filename, _headers = urllib.request.urlretrieve(feat_info['zip_url'], download_filename) |                 filename, _headers = urllib.request.urlretrieve(feat_info['zip_url'], download_filename) | ||||||
|                 md5 = hashlib.md5(open(filename, 'rb').read()).hexdigest() |                 md5 = hashlib.md5(open(filename, 'rb').read()).hexdigest() | ||||||
|                 if checksum_md5 != md5: |                 if checksum_md5 != md5: | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user