Changeset 2023

Timestamp:

02/13/2010 10:31:27 AM (6 months ago)

Author:

djb61

Message:

Fix the reporting of position 1 for all users/groups involved in a race. Additionally add a mechanism to allow configuring of the maximum number of users/groups to include in a race complete announce. These fixes have been applied to both sfv and diz based race announces.
See: #267

Location:

trunk/src/plugins

Files:

• org.drftpd.plugins.sitebot.announce.zipscript.zip/resources (added)
• org.drftpd.plugins.sitebot.announce.zipscript.zip/resources/conf (added)
• org.drftpd.plugins.sitebot.announce.zipscript.zip/resources/conf/plugins (added)
• org.drftpd.plugins.sitebot.announce.zipscript.zip/resources/conf/plugins/zipscript.conf.dist (added)
• org.drftpd.plugins.sitebot.announce.zipscript.zip/src/org/drftpd/plugins/sitebot/announce/zipscript/zip/ZipAnnouncer.java (modified) (3 diffs)
• org.drftpd.plugins.sitebot.announce.zipscript/resources/conf/plugins/zipscript.conf.dist (added)
• org.drftpd.plugins.sitebot.announce.zipscript/src/org/drftpd/plugins/sitebot/announce/zipscript/SFVAnnouncer.java (modified) (3 diffs)

trunk/src/plugins/org.drftpd.plugins.sitebot.announce.zipscript.zip/src/org/drftpd/plugins/sitebot/announce/zipscript/zip/ZipAnnouncer.java

@@ -192 +192 @@
                                         sayOutput(ReplacerUtils.jprintf(_keyPrefix+".store.complete", env, _bundle), writer);
 
+                                        // Find max users/groups to announce
+                                        int maxUsers;
+                                        int maxGroups;
+                                        try {
+                                                maxUsers = Integer.valueOf(GlobalContext.getGlobalContext().getPluginsConfig().
+                                                                getPropertiesForPlugin("zipscript.conf").getProperty("irc.zip.maxusers", "10"));
+                                        } catch (NumberFormatException e) {
+                                                logger.error("Non numeric irc.zip.maxusers setting in zipscript.conf, using default");
+                                                maxUsers = 10;
+                                        }
+                                        try {
+                                                maxGroups = Integer.valueOf(GlobalContext.getGlobalContext().getPluginsConfig().
+                                                                getPropertiesForPlugin("zipscript.conf").getProperty("irc.zip.maxgroups", "10"));
+                                        } catch (NumberFormatException e) {
+                                                logger.error("Non numeric irc.zip.maxgroups setting in zipscript.conf, using default");
+                                                maxGroups = 10;
+                                        }
+
                                         // Add racer stats
                                         int position = 1;
@@ -245 +263 @@
                                                                                 raceuser, GlobalContext.getGlobalContext().getUserManager())));
                                                 sayOutput(ReplacerUtils.jprintf(_keyPrefix+".store.complete.racer", raceenv, _bundle), writer);
+
+                                                position++;
+                                                if (position > maxUsers) {
+                                                        break;
+                                                }
                                         }
 
@@ -265 +288 @@
 
                                                 sayOutput(ReplacerUtils.jprintf(_keyPrefix+".store.complete.group", raceenv, _bundle), writer);
+
+                                                position++;
+                                                if (position > maxGroups) {
+                                                        break;
+                                                }
                                         }
                                 }

trunk/src/plugins/org.drftpd.plugins.sitebot.announce.zipscript/src/org/drftpd/plugins/sitebot/announce/zipscript/SFVAnnouncer.java

@@ -197 +197 @@
                                         sayOutput(ReplacerUtils.jprintf(_keyPrefix+".store.complete", env, _bundle), writer);
 
+                                        // Find max users/groups to announce
+                                        int maxUsers;
+                                        int maxGroups;
+                                        try {
+                                                maxUsers = Integer.valueOf(GlobalContext.getGlobalContext().getPluginsConfig().
+                                                                getPropertiesForPlugin("zipscript.conf").getProperty("irc.sfv.maxusers", "10"));
+                                        } catch (NumberFormatException e) {
+                                                logger.error("Non numeric irc.sfv.maxusers setting in zipscript.conf, using default");
+                                                maxUsers = 10;
+                                        }
+                                        try {
+                                                maxGroups = Integer.valueOf(GlobalContext.getGlobalContext().getPluginsConfig().
+                                                                getPropertiesForPlugin("zipscript.conf").getProperty("irc.sfv.maxgroups", "10"));
+                                        } catch (NumberFormatException e) {
+                                                logger.error("Non numeric irc.sfv.maxgroups setting in zipscript.conf, using default");
+                                                maxGroups = 10;
+                                        }
+                                        
                                         // Add racer stats
                                         int position = 1;
@@ -250 +268 @@
                                                                                 raceuser, GlobalContext.getGlobalContext().getUserManager())));
                                                 sayOutput(ReplacerUtils.jprintf(_keyPrefix+".store.complete.racer", raceenv, _bundle), writer);
+                                                
+                                                position++;
+                                                if (position > maxUsers) {
+                                                        break;
+                                                }
                                         }
 
@@ -270 +293 @@
 
                                                 sayOutput(ReplacerUtils.jprintf(_keyPrefix+".store.complete.group", raceenv, _bundle), writer);
+                                                
+                                                position++;
+                                                if (position > maxGroups) {
+                                                        break;
+                                                }
                                         }
                                 }