From 999045765a28c39c0dba81441fe7d90b0519cbc2 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Sun, 22 Apr 2012 18:09:55 +0000 Subject: [PATCH] * update filetype and release-group data --- source/net/sourceforge/filebot/media.types | 1 + .../filebot/ui/rename/History.java | 54 ++++----- website/data/release-groups.txt | 114 +++++++++++++++++- 3 files changed, 140 insertions(+), 29 deletions(-) diff --git a/source/net/sourceforge/filebot/media.types b/source/net/sourceforge/filebot/media.types index b8f22038..118e0e89 100644 --- a/source/net/sourceforge/filebot/media.types +++ b/source/net/sourceforge/filebot/media.types @@ -89,6 +89,7 @@ mpg mpeg ts + tp wmv diff --git a/source/net/sourceforge/filebot/ui/rename/History.java b/source/net/sourceforge/filebot/ui/rename/History.java index 3da4d748..33a905ec 100644 --- a/source/net/sourceforge/filebot/ui/rename/History.java +++ b/source/net/sourceforge/filebot/ui/rename/History.java @@ -22,22 +22,22 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement(name = "history") -class History { +public class History { @XmlElement(name = "sequence") private List sequences; - + public History() { this.sequences = new ArrayList(); } - + public History(Collection sequences) { this.sequences = new ArrayList(sequences); } - + public static class Sequence { @XmlAttribute(name = "date", required = true) @@ -46,17 +46,17 @@ class History { @XmlElement(name = "rename", required = true) private List elements; - + private Sequence() { // hide constructor } - + public Date date() { return date; } - + public List elements() { if (elements == null) return emptyList(); @@ -64,7 +64,7 @@ class History { return unmodifiableList(elements); } - + @Override public boolean equals(Object obj) { if (obj instanceof Sequence) { @@ -75,14 +75,14 @@ class History { return false; } - + @Override public int hashCode() { return Arrays.hashCode(new Object[] { elements, date }); } } - + public static class Element { @XmlAttribute(name = "dir", required = true) @@ -94,34 +94,34 @@ class History { @XmlAttribute(name = "to", required = true) private String to; - + public Element() { // used by JAXB } - + public Element(String from, String to, File dir) { this.from = from; this.to = to; this.dir = dir; } - + public File dir() { return dir; } - + public String from() { return from; } - + public String to() { return to; } - + @Override public boolean equals(Object obj) { if (obj instanceof Element) { @@ -132,19 +132,19 @@ class History { return false; } - + @Override public int hashCode() { return Arrays.hashCode(new Object[] { to, from, dir }); } } - + public List sequences() { return unmodifiableList(sequences); } - + public void add(Collection elements) { Sequence sequence = new Sequence(); sequence.date = new Date(); @@ -153,17 +153,17 @@ class History { add(sequence); } - + public void add(Sequence sequence) { this.sequences.add(sequence); } - + public void addAll(Collection sequences) { this.sequences.addAll(sequences); } - + public void merge(History history) { for (Sequence sequence : history.sequences()) { if (!sequences.contains(sequence)) { @@ -172,12 +172,12 @@ class History { } } - + public void clear() { sequences.clear(); } - + @Override public boolean equals(Object obj) { if (obj instanceof History) { @@ -188,13 +188,13 @@ class History { return false; } - + @Override public int hashCode() { return sequences.hashCode(); } - + public static void exportHistory(History history, File file) throws IOException { try { Marshaller marshaller = JAXBContext.newInstance(History.class).createMarshaller(); @@ -206,7 +206,7 @@ class History { } } - + public static History importHistory(File file) throws IOException { try { Unmarshaller unmarshaller = JAXBContext.newInstance(History.class).createUnmarshaller(); diff --git a/website/data/release-groups.txt b/website/data/release-groups.txt index 04d4a2f8..9d1d2426 100644 --- a/website/data/release-groups.txt +++ b/website/data/release-groups.txt @@ -14,11 +14,16 @@ AaS aceford AE AEGiS +AFG AiRWAVES +ALANiS +ALeSiO ALLiANCE +AMiABLE ANiHLS ARiGOLD ASAP +AVCHD AW aWake aXXo @@ -29,21 +34,29 @@ Barba BaSS BAUM BDiSC +beAst BiA +BluDragon blueF BlueTV blueZilla BMB +bReAK BrG BRZONE BTSD +Bunny +C4TV CAMELOT +CBGB CDD CDDHD Chakra Chara CHD +CHDBits CHDSUBS +CHDTV Chel CHGRP Chotab @@ -53,11 +66,15 @@ CiA CiNEFiLE CiNEFOX CLASSiC +CLDD COALiTiON +COMPULSION CPtScene CPY CRF CRIMSON +CRiSC +CROSSBOW Crow CSHD CtrlHD @@ -72,6 +89,7 @@ DATA DAW DDC DEAL +decibeL DEFiNiTE DEFiNiTiON DEFUSED @@ -86,6 +104,7 @@ DIMENSION DiMiTri DiNA DiR +DiRTY disc DiTa DiVERSiTY @@ -95,43 +114,59 @@ DMT DnB DNL DNR +DON DOT DOWN DUQA DutchReleaseTeam +EBi EbP ECI +Eclipse Ekolb Electri4ka ELECTRiC Electrichka +EmC EMPiREHD EnDoR EPiK ESiR ETM ETRG +EucHD EuchHD EUHD EuReKA ExtraTorrentRG eztv +FASM +FELONY +FFNDVD FHM +FiHTV FLAiTE fLAMEhd FLAWL3SS FLX FmE ForceBleue +FoRM +FourGHD FoV FPG FQM +FraMeSToR +Frost FSiHD Ft4U FTVDT +FTW-HD +fty Funner FXG FxM +G3N3 GB GEHENNA GFY @@ -140,39 +175,55 @@ GMoRK Goblin10 GoLDSToNE GOTHiC +GriOTS +Grond H2 -Haggis +h264iRMU +H@M +HaB +HAGGiS HALCYON HANGOVER +hannibal HD-UNiT3D HD1080 +HDBRiSe HDC HDChina +HDEncX HDFiRE HDFL HDi HDL HDMaNiAcS +HDME HDMI HDQ +HDS HDVD +HDxT Helix HHH HiDt +HiFi HiGHTIMES HiNT +HoodBag HOWL HqDTS +HUBRiS hV HWD HWE HyDe Hype iaK +iCANDY iGNHD IGUANA iKA iLL +iMAGiNE IMF IMMERSE imNaKeD @@ -182,11 +233,14 @@ InSaNiTy iNSECTS iNSPiRED iNTERNAL +INtL iON iTA ITZ Japhson JAVLiU +JCH +JENC k2 KaKa keltz @@ -195,6 +249,7 @@ KLAXXON KOENiG KRaLiMaRKo KYR +LamB Larceny LEViTY LIMITED @@ -203,11 +258,16 @@ LMAO LoD LOL LOLCATS +LoneWolf +LP LTT +M794 MAiN MainEvent MARiNES MAXSPEED +MC +MCR MEDiEVAL METiS MiND @@ -219,10 +279,13 @@ MONK MOREHD MOTU MOViESTARS +mSD MsR MuSt mV4U mVmHD +MySiLU +NaRB NBS NEW.SOURCE NewArtRiot @@ -230,6 +293,7 @@ NFHD NGR NGXHD NhaNc3 +NiBURU NiF Nile NiX @@ -239,6 +303,7 @@ NORARS NOsegmenT NoTV NOVO +NPW NSUBS NT NTb @@ -246,6 +311,7 @@ NWO NyTT OAS Omifast +OmU ONYX ORC ORENJi @@ -253,8 +319,11 @@ ORPHEUS OSiTV OUTDATED P0W4 +Pa@Ph papi PaYxXx +PeeWee +Penumbra PerfectionHD PFa PhoenixRG @@ -262,6 +331,7 @@ piepHD PiLAF PiNER PiX +PixelHD POD PoRNDoCtOR PORNOHOLiCS @@ -269,24 +339,32 @@ PoTuS PP PPQ Prime +PriMeHD +PRiNCE PRoDJi PROGRESS PROPHETS ProPL PRXHD +PS3-TEAM psig PtS +Pudding Pukka PURE PxHD +Q0S +QCF QDP QXE +R&C rabomil RANDi RAP Razor1911 REAVERS RED +Redµx Redµx REFiNED RELOADED @@ -294,16 +372,22 @@ Republic REPULSiON REVEiLLE REWARD +RightSiZE +RiplleyHD RiVER RMT RoCKRioT RSG +RTA +RuDE +RUDOS S26 SAiNTS SAiVERT SAMFD SANTI Sapphire +Scratch404 SecretMyth SECTOR7 SEPTiC @@ -312,47 +396,66 @@ SFM SHAMNBOYZ shortbrehd SiGHTHD +SiHD +SiLU SiNNERS SiTV +SKALiWAGZ SLM SLO +SMoKeR Sneak SoCkS SoW +SpaceHD STV +SuBoXoNe SUNSPOT SURFER SVD Swesub SYS t00ng0d +TASTETV TB TELEFLiX TERRA +terribleHD +terribleSD THOR -Thora +THORA TiMELORDS +TjHD TLF TM TN TOKUS TOPAZ trentalent +TrollHD TruCK +tRuE TRUEFRENCH +tRuEHD +TsH TVA +TWiZTED TX +TxN ULTiMATE UMF UNSKiLLED USELESS UVall +VaAr3 VanRay VCDVaULT ViCiOsO +ViKAT ViNYL ViSiON ViSTA +ViSTA™ VLiS VOA VoMiT @@ -367,8 +470,12 @@ WHiiZz WiDE WiKi WiRE +WoLF +Wolky WPi +WRCR WuSiWuG +Xander XiA XOR XOXO @@ -379,4 +486,7 @@ XTM XTSF XXX4U YanY +YesTV +Ygt YOUFORGOTTOREPACKTHIS +ZBS