Changeset 4962 for lliurex-store/trunk/fuentes
- Timestamp:
- May 30, 2017, 10:28:50 AM (4 years ago)
- Location:
- lliurex-store/trunk/fuentes
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
lliurex-store/trunk/fuentes/debian/changelog
r4935 r4962 1 lliurex-store (0.2.10.lliurex4) xenial; urgency=medium 2 3 * Purged all zmd-deb duplicated apps (I hope...) 4 5 -- Juanma Navarro Mañez <juanma1980@gmail.com> Tue, 30 May 2017 10:23:13 +0200 6 1 7 lliurex-store (0.2.10.lliurex3) xenial; urgency=medium 2 8 -
lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/loadStore.py
r4811 r4962 81 81 uniqDict={} 82 82 lliurexApps={} 83 zmdList=[] 83 84 for app in applist: 84 85 #Zomandos get max priority 85 if app.has_category(' zomando'):86 if app.has_category('Zomando'): 86 87 self._debug("Prioritize zmd "+str(app.get_id())) 87 88 app.set_priority(400) 88 89 lliurexApps.update({app.get_id_filename():app}) 90 id=str(app.get_id_filename()).replace('zero-lliurex-','') 91 zmdList.append(id) 89 92 #Prioritize Lliurex apps 90 93 elif app.has_category('Lliurex'): … … 126 129 store.remove_app(uniqDict[pkg]['app']) 127 130 elif pkg: 131 self._debug("Adding "+app.get_id_filename()+" to uniq dict") 128 132 uniqDict.update({pkg:{'fn':app.get_id_filename(),'app':app}}) 129 133 #Delete zomando-related debs 134 store=self._purge_zomandos(zmdList,store) 130 135 #Check the blacklist 131 136 store=self._apply_blacklist(store) 132 137 return (store) 133 138 #def _sanitize_store 139 140 def _purge_zomandos(self,zmdList,store): 141 for appId in zmdList: 142 self._debug("Searching debs related to "+appId) 143 purgeList=store.get_apps_by_id(appId) 144 purgeList.extend(store.get_apps_by_id(appId+".desktop")) 145 for purgeApp in purgeList: 146 if purgeApp: 147 if not purgeApp.has_category('Zomando'): 148 self._debug("Removed related zomando app "+str(purgeApp.get_categories())) 149 store.remove_app(purgeApp) 150 return(store) 151 #def _purge_zomandos 134 152 135 153 def _apply_blacklist(self,store): -
lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/plugins/zmdManager.py
r4908 r4962 192 192 def _get_Zmd_Info(self,appInfo): 193 193 zmd=appInfo['package'] 194 appInfo['state']=' available'194 appInfo['state']='Available' 195 195 try: 196 196 n4dvars=self.n4dclient.get_variable("","VariablesManager","ZEROCENTER") … … 199 199 for key in n4dvars: 200 200 if zmd.lower() in key.lower(): 201 if n4dvars[key]['state']==1: 202 appInfo['state']='installed' 201 if 'state' in n4dvars[key]: 202 if n4dvars[key]['state']==1: 203 appInfo['state']='installed' 203 204 else: 204 205 self._set_status(2) 205 except :206 except Exception as e: 206 207 self._set_status(10) 207 208 # self.result['data'].append(appInfo) -
lliurex-store/trunk/fuentes/python3-lliurex-store.install/usr/share/lliurexstore/storeManager.py
r4924 r4962 375 375 result['status']={'status':0,'msg':''} 376 376 for appInfo in applistInfo: 377 result['data'].append(appInfo)377 # result['data'].append(appInfo) 378 378 package_type=self._check_package_type(appInfo) 379 379 if package_type in typeDict: … … 387 387 #Only search full info if it's required 388 388 if (fullsearch==False and package_type=='deb'): 389 #result['data'].extend(typeDict[package_type])389 result['data'].extend(typeDict[package_type]) 390 390 continue 391 391 self._debug("Retrieving info for "+str(typeDict[package_type])) 392 392 pkgInfoFunction=self._execute_class_method(action,package_type,launchedby) 393 result.update(pkgInfoFunction.execute_action(action,typeDict[package_type])) 393 # result.update(pkgInfoFunction.execute_action(action,typeDict[package_type])) 394 result['data'].extend(pkgInfoFunction.execute_action(action,typeDict[package_type])['data']) 395 result['status']=pkgInfoFunction.execute_action(action,typeDict[package_type])['status'] 394 396 return(result) 395 397 #def _get_Extended_App_Info
Note: See TracChangeset
for help on using the changeset viewer.