Changeset 1353

Timestamp:

05/23/08 03:39:35 (8 months ago)

Author:

astormont

Message:

Checks to see if in packlist.all before adding to queue, and raises exception otherwise

Files:

• wine-doors/trunk/src/packlist.py (modified) (1 diff)
• wine-doors/trunk/src/queue.py (modified) (1 diff)
• wine-doors/trunk/src/winedoors.glade (modified) (2 diffs)

wine-doors/trunk/src/packlist.py

@@ -571 +571 @@
-                        return True
-        return False
+
+    def InAll (self, pack_shortname, version=None ):
+        for tmp_pack in self.all:
+            if tmp_pack['shortname'] == pack_shortname:
+                if not version:
+                    return True
+                for pack_version in tmp_pack['versions']:
+                    [( av_version, 
+                       wineversion, 
+                       winevariant, 
+                       appdb_rating, 
+                       installersize, 
+                       installedsize, 
+                       votes,
+                       av_revision,
+                       app_pack )] = pack_version
+                    if av_version == version:
+                        return True
+        return False
-            
-    def InPacks (self, pack_shortname ):

wine-doors/trunk/src/queue.py

@@ -23 +23 @@
-
-    def Add( self, action, pack=None, version=None, repo=None ):
+        if not packlist.InAll( pack, version ):
+            raise "QueueError: Attempted to add pack to queue which is not in packlist.all"
-        if not self.IsOnQueue( pack, version, action ):
-            if self.IsOnQueue( pack, version ):

wine-doors/trunk/src/winedoors.glade

@@ -3170 +3170 @@
-                <property name="visible">True</property>
-                <child>
-1
+
-                    <property name="height_request">25</property>
-                    <property name="pulse_step">0.10000000149</property>
@@ -3304 +3304 @@
-        </child>
-        <child>
-2
+
-            <property name="xalign">0</property>
-            <property name="use_markup">True</property>